diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..bbd8fd6
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,21 @@
+name: CI
+
+on: pull_request
+
+jobs:
+  build:
+    name: Maven
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout files in the repository
+        uses: actions/checkout@v3
+
+      - name: Set up JDK 8
+        uses: actions/setup-java@v3
+        with:
+          java-version: "8"
+          distribution: "zulu"
+
+      - name: Build with Maven
+        run: mvn --batch-mode --update-snapshots package
diff --git a/.gitignore b/.gitignore
index ae3c172..09e3bc9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..610dc5c
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+  xmlns = "http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>hilbertmf</groupId>
+  <artifactId>8bitsFightClub</artifactId>
+  <version>1.0</version>
+
+  <packaging>jar</packaging>
+
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>3.1.0</version>
+        <configuration>
+          <archive>
+            <manifest>
+              <addClasspath>true</addClasspath>
+              <classpathPrefix>lib/</classpathPrefix>
+              <mainClass>main.Game</mainClass>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/src/audio/MusicPlayer.java b/src/main/java/audio/MusicPlayer.java
similarity index 100%
rename from src/audio/MusicPlayer.java
rename to src/main/java/audio/MusicPlayer.java
diff --git a/src/entity/Animation.java b/src/main/java/entity/Animation.java
similarity index 100%
rename from src/entity/Animation.java
rename to src/main/java/entity/Animation.java
diff --git a/src/entity/Batarang.java b/src/main/java/entity/Batarang.java
similarity index 100%
rename from src/entity/Batarang.java
rename to src/main/java/entity/Batarang.java
diff --git a/src/entity/Batman.java b/src/main/java/entity/Batman.java
similarity index 100%
rename from src/entity/Batman.java
rename to src/main/java/entity/Batman.java
diff --git a/src/entity/Bullet.java b/src/main/java/entity/Bullet.java
similarity index 100%
rename from src/entity/Bullet.java
rename to src/main/java/entity/Bullet.java
diff --git a/src/entity/Dragon.java b/src/main/java/entity/Dragon.java
similarity index 100%
rename from src/entity/Dragon.java
rename to src/main/java/entity/Dragon.java
diff --git a/src/entity/Entity.java b/src/main/java/entity/Entity.java
similarity index 100%
rename from src/entity/Entity.java
rename to src/main/java/entity/Entity.java
diff --git a/src/entity/FireBall.java b/src/main/java/entity/FireBall.java
similarity index 100%
rename from src/entity/FireBall.java
rename to src/main/java/entity/FireBall.java
diff --git a/src/entity/HUD.java b/src/main/java/entity/HUD.java
similarity index 100%
rename from src/entity/HUD.java
rename to src/main/java/entity/HUD.java
diff --git a/src/entity/Megaman.java b/src/main/java/entity/Megaman.java
similarity index 100%
rename from src/entity/Megaman.java
rename to src/main/java/entity/Megaman.java
diff --git a/src/entity/Spiderman.java b/src/main/java/entity/Spiderman.java
similarity index 100%
rename from src/entity/Spiderman.java
rename to src/main/java/entity/Spiderman.java
diff --git a/src/entity/Stickyweb.java b/src/main/java/entity/Stickyweb.java
similarity index 100%
rename from src/entity/Stickyweb.java
rename to src/main/java/entity/Stickyweb.java
diff --git a/src/gameState/CharacterSelectState.java b/src/main/java/gameState/CharacterSelectState.java
similarity index 100%
rename from src/gameState/CharacterSelectState.java
rename to src/main/java/gameState/CharacterSelectState.java
diff --git a/src/gameState/EntryState.java b/src/main/java/gameState/EntryState.java
similarity index 100%
rename from src/gameState/EntryState.java
rename to src/main/java/gameState/EntryState.java
diff --git a/src/gameState/GameState.java b/src/main/java/gameState/GameState.java
similarity index 100%
rename from src/gameState/GameState.java
rename to src/main/java/gameState/GameState.java
diff --git a/src/gameState/GameStateManager.java b/src/main/java/gameState/GameStateManager.java
similarity index 100%
rename from src/gameState/GameStateManager.java
rename to src/main/java/gameState/GameStateManager.java
diff --git a/src/gameState/Help.java b/src/main/java/gameState/Help.java
similarity index 100%
rename from src/gameState/Help.java
rename to src/main/java/gameState/Help.java
diff --git a/src/gameState/Pause.java b/src/main/java/gameState/Pause.java
similarity index 100%
rename from src/gameState/Pause.java
rename to src/main/java/gameState/Pause.java
diff --git a/src/gameState/PlayState.java b/src/main/java/gameState/PlayState.java
similarity index 100%
rename from src/gameState/PlayState.java
rename to src/main/java/gameState/PlayState.java
diff --git a/src/main/Game.java b/src/main/java/main/Game.java
similarity index 100%
rename from src/main/Game.java
rename to src/main/java/main/Game.java
diff --git a/src/main/GamePanel.java b/src/main/java/main/GamePanel.java
similarity index 100%
rename from src/main/GamePanel.java
rename to src/main/java/main/GamePanel.java
diff --git a/src/tileMap/Background.java b/src/main/java/tileMap/Background.java
similarity index 100%
rename from src/tileMap/Background.java
rename to src/main/java/tileMap/Background.java
diff --git a/src/tileMap/Tile.java b/src/main/java/tileMap/Tile.java
similarity index 100%
rename from src/tileMap/Tile.java
rename to src/main/java/tileMap/Tile.java
diff --git a/src/tileMap/TileMap.java b/src/main/java/tileMap/TileMap.java
similarity index 100%
rename from src/tileMap/TileMap.java
rename to src/main/java/tileMap/TileMap.java
diff --git a/src/resources/HUD/hud.png b/src/main/resources/resources/HUD/hud.png
similarity index 100%
rename from src/resources/HUD/hud.png
rename to src/main/resources/resources/HUD/hud.png
diff --git a/src/resources/audio/megaman3.wav b/src/main/resources/resources/audio/megaman3.wav
similarity index 100%
rename from src/resources/audio/megaman3.wav
rename to src/main/resources/resources/audio/megaman3.wav
diff --git a/src/resources/audio/topGear.wav b/src/main/resources/resources/audio/topGear.wav
similarity index 100%
rename from src/resources/audio/topGear.wav
rename to src/main/resources/resources/audio/topGear.wav
diff --git a/src/resources/backgrounds/background-road.png b/src/main/resources/resources/backgrounds/background-road.png
similarity index 100%
rename from src/resources/backgrounds/background-road.png
rename to src/main/resources/resources/backgrounds/background-road.png
diff --git a/src/resources/backgrounds/banner.jpg b/src/main/resources/resources/backgrounds/banner.jpg
similarity index 100%
rename from src/resources/backgrounds/banner.jpg
rename to src/main/resources/resources/backgrounds/banner.jpg
diff --git a/src/resources/screenshot.jpg b/src/main/resources/resources/screenshot.jpg
similarity index 100%
rename from src/resources/screenshot.jpg
rename to src/main/resources/resources/screenshot.jpg
diff --git a/src/resources/sprites/player/batarang.png b/src/main/resources/resources/sprites/player/batarang.png
similarity index 100%
rename from src/resources/sprites/player/batarang.png
rename to src/main/resources/resources/sprites/player/batarang.png
diff --git a/src/resources/sprites/player/batmanModel.png b/src/main/resources/resources/sprites/player/batmanModel.png
similarity index 100%
rename from src/resources/sprites/player/batmanModel.png
rename to src/main/resources/resources/sprites/player/batmanModel.png
diff --git a/src/resources/sprites/player/batmanSpriteSheet.png b/src/main/resources/resources/sprites/player/batmanSpriteSheet.png
similarity index 100%
rename from src/resources/sprites/player/batmanSpriteSheet.png
rename to src/main/resources/resources/sprites/player/batmanSpriteSheet.png
diff --git a/src/resources/sprites/player/bullet.png b/src/main/resources/resources/sprites/player/bullet.png
similarity index 100%
rename from src/resources/sprites/player/bullet.png
rename to src/main/resources/resources/sprites/player/bullet.png
diff --git a/src/resources/sprites/player/dragonModel.png b/src/main/resources/resources/sprites/player/dragonModel.png
similarity index 100%
rename from src/resources/sprites/player/dragonModel.png
rename to src/main/resources/resources/sprites/player/dragonModel.png
diff --git a/src/resources/sprites/player/dragonSprites.gif b/src/main/resources/resources/sprites/player/dragonSprites.gif
similarity index 100%
rename from src/resources/sprites/player/dragonSprites.gif
rename to src/main/resources/resources/sprites/player/dragonSprites.gif
diff --git a/src/resources/sprites/player/fireball.gif b/src/main/resources/resources/sprites/player/fireball.gif
similarity index 100%
rename from src/resources/sprites/player/fireball.gif
rename to src/main/resources/resources/sprites/player/fireball.gif
diff --git a/src/resources/sprites/player/megamanModel.png b/src/main/resources/resources/sprites/player/megamanModel.png
similarity index 100%
rename from src/resources/sprites/player/megamanModel.png
rename to src/main/resources/resources/sprites/player/megamanModel.png
diff --git a/src/resources/sprites/player/megamanSpriteSheet.png b/src/main/resources/resources/sprites/player/megamanSpriteSheet.png
similarity index 100%
rename from src/resources/sprites/player/megamanSpriteSheet.png
rename to src/main/resources/resources/sprites/player/megamanSpriteSheet.png
diff --git a/src/resources/sprites/player/spidermanModel.png b/src/main/resources/resources/sprites/player/spidermanModel.png
similarity index 100%
rename from src/resources/sprites/player/spidermanModel.png
rename to src/main/resources/resources/sprites/player/spidermanModel.png
diff --git a/src/resources/sprites/player/spidermanSpriteSheet.png b/src/main/resources/resources/sprites/player/spidermanSpriteSheet.png
similarity index 100%
rename from src/resources/sprites/player/spidermanSpriteSheet.png
rename to src/main/resources/resources/sprites/player/spidermanSpriteSheet.png
diff --git a/src/resources/sprites/player/stickyweb.png b/src/main/resources/resources/sprites/player/stickyweb.png
similarity index 100%
rename from src/resources/sprites/player/stickyweb.png
rename to src/main/resources/resources/sprites/player/stickyweb.png