diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index baae113..a2c38a4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -20,7 +20,9 @@ jobs:
           build-root-directory: app
           gradle-version: 8.7
       - run: make lint
+        working-directory: ./app
       - run: make test
+        working-directory: ./app
       - name: Publish code coverage
         if: ${{ github.event_name == 'push' }}
         uses: paambaati/codeclimate-action@v3.0.0
@@ -29,5 +31,6 @@ jobs:
           JACOCO_SOURCE_PATH: ${{github.workspace}}/app/src/main/java
         with:
           debug: true
+          workingDirectory: ./app
           coverageCommand: make report
           coverageLocations: ${{github.workspace}}/app/build/reports/jacoco/test/jacocoTestReport.xml:jacoco
diff --git a/Makefile b/Makefile
index cc9599b..05b4e20 100644
--- a/Makefile
+++ b/Makefile
@@ -1,46 +1,5 @@
-run-dist:
-	app/build/install/app/bin/app
-
-run-dist-help:
-	app/build/install/app/bin/app -h
-
-run-dist-version:
-	app/build/install/app/bin/app -V
-
-run-dist-test:
-	app/build/install/app/bin/app src/test/resources/test1.json src/test/resources/test2.json
-
-run-dist-test-yml:
-	app/build/install/app/bin/app src/test/resources/test1.yml src/test/resources/test2.yml
-
-clean:
-	app/gradlew clean
-
-build:
-	app/gradlew clean build
-
-install:
-	app/gradlew clean install
-
-run:
-	app/gradlew run
-
-test:
-	cp app
-	./gradlew test
-
 report:
-	cp app
-	./gradlew jacocoTestReport
-
-lint:
-	cd app
-	./gradlew checkstyleMain
+	make -C app report
 
-check-deps:
-	app/gradlew dependencyUpdates -Drevision=release
-
-
-build-run: build run
-
-.PHONY: build
\ No newline at end of file
+run-dist:
+	make -C app run-dist
\ No newline at end of file
diff --git a/app/Makefile b/app/Makefile
new file mode 100644
index 0000000..71c0df8
--- /dev/null
+++ b/app/Makefile
@@ -0,0 +1,44 @@
+run-dist:
+	./build/install/app/bin/app
+
+run-dist-help:
+	./build/install/app/bin/app -h
+
+run-dist-version:
+	./build/install/app/bin/app -V
+
+run-dist-test:
+	./build/install/app/bin/app src/test/resources/test1.json src/test/resources/test2.json
+
+run-dist-test-yml:
+	./build/install/app/bin/app src/test/resources/test1.yml src/test/resources/test2.yml
+
+clean:
+	./gradlew clean
+
+build:
+	./gradlew clean build
+
+install:
+	./gradlew clean install
+
+run:
+	./gradlew run
+
+test:
+	./gradlew test
+
+report:
+	./gradlew jacocoTestReport
+
+lint:
+	cd app
+	./gradlew checkstyleMain
+
+check-deps:
+	app/gradlew dependencyUpdates -Drevision=release
+
+
+build-run: build run
+
+.PHONY: build
\ No newline at end of file