diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fba77b2..f7c9031 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,35 +1,26 @@
 image: microsoft/dotnet:latest
 
 before_script:
-  - cd TheGameExtreme
-  - dotnet restore view
-  - dotnet restore model
-  - dotnet restore viewmodel
-  - cd ../TheGameExtreme.Android
-  - dotnet restore view
-  - cd ../TheGameExtreme.IOS
-  - dotnet restore view
-  - cd ../test
-  - dotnet restore view
-  - dotnet restore model
-  - dotnet restore viewmodel
+  - dotnet restore TheGameExtreme
+  - dotnet restore TheGameExtreme/model
+  - dotnet restore TheGameExtreme/viewmodel
   
 
 
 build:
   stage : build
   script:
-     - dotnet build -c Release --no-restore view
-     - dotnet build -c Release --no-restore model
-     - dotnet build -c Release --no-restore viewmodel
-     - dotnet publish -c Release --no-restore -o $CI_PROJECT_DIR/build/release view
-     - dotnet publish -c Release --no-restore -o $CI_PROJECT_DIR/build/release model
-     - dotnet publish -c Release --no-restore -o $CI_PROJECT_DIR/build/release viewmodel
+     - dotnet build -c Release --no-restore TheGameExtreme
+     - dotnet build -c Release --no-restore TheGameExtreme/model
+     - dotnet build -c Release --no-restore TheGameExtreme/viewmodel
+     - dotnet publish -c Release --no-restore -o $CI_PROJECT_DIR/build/release TheGameExtreme
+     - dotnet publish -c Release --no-restore -o $CI_PROJECT_DIR/build/release TheGameExtreme/model
+     - dotnet publish -c Release --no-restore -o $CI_PROJECT_DIR/build/release TheGameExtreme/viewmodel
 
 
 unit_tests:
   stage : test
   script:
-    - dotnet test --no-restore view
-    - dotnet test --no-restore model
-    - dotnet test --no-restore viewmodel
\ No newline at end of file
+    - dotnet test --no-restore TheGameExtreme
+    - dotnet test --no-restore TheGameExtreme/model
+    - dotnet test --no-restore TheGameExtreme/viewmodel
\ No newline at end of file