10 files changed, 10 insertions, 10 deletions
diff --git a/.build.yml b/.build.yml
index 396e525..99d052c 100644
--- a/.build.yml
+++ b/.build.yml
@@ -7,7 +7,7 @@ sources:
 tasks:
   - check-format: |
       cd opendeco
-      clang-format-13 -n --Werror *.c *.h
+      clang-format-13 -n --Werror src/*.c src/*.h test/*.c test/*.h
   - build: |
       cd opendeco
       make
diff --git a/Makefile b/Makefile
index ef132c5..ddae9d9 100644
--- a/Makefile
+++ b/Makefile
@@ -2,19 +2,19 @@ VERSION=\"$(shell git describe --tags --dirty)\"
 
 PREFIX = /usr/local
 
-all: opendeco test/opendeco_test
+all: opendeco opendeco_test
 
-opendeco: opendeco.c deco.c deco.h schedule.c schedule.h output.c output.h
-	gcc --std=c99 -pedantic -Wall -Werror -O3 -DVERSION=${VERSION} opendeco.c deco.c schedule.c output.c -lm -o opendeco
+opendeco: src/opendeco.c src/deco.c src/deco.h src/schedule.c src/schedule.h src/output.c src/output.h
+	gcc --std=c99 -pedantic -Wall -Werror -O3 -DVERSION=${VERSION} src/opendeco.c src/deco.c src/schedule.c src/output.c -lm -o opendeco
 
-test/opendeco_test: deco.c test/opendeco_test.c
-	gcc --std=c99 -pedantic -Wall -Werror -O3 test/minunit.c test/opendeco_test.c test/deco_test.c deco.c -lm -o test/opendeco_test
+opendeco_test: test/opendeco_test.c test/deco_test.c src/deco.c 
+	gcc --std=c99 -pedantic -Wall -Werror -O3 test/minunit.c test/opendeco_test.c test/deco_test.c src/deco.c -lm -o opendeco_test
 
 run: opendeco
 	./opendeco -d 30 -t 120 -g EAN32 --decogasses EAN50
 
-test: test/opendeco_test
-	./test/opendeco_test
+test: opendeco_test
+	./opendeco_test
 
 install: all
 	mkdir -p ${DESTDIR}${PREFIX}/bin
@@ -26,4 +26,4 @@ uninstall:
 
 clean:
 	rm opendeco
-	rm test/opendeco_test
+	rm opendeco_test
diff --git a/deco.c b/src/deco.c
index 5ef6537..5ef6537 100644
--- a/deco.c
+++ b/src/deco.c
diff --git a/deco.h b/src/deco.h
index 439626f..439626f 100644
--- a/deco.h
+++ b/src/deco.h
diff --git a/opendeco.c b/src/opendeco.c
index 9231ab3..9231ab3 100644
--- a/opendeco.c
+++ b/src/opendeco.c
diff --git a/output.c b/src/output.c
index 589c811..589c811 100644
--- a/output.c
+++ b/src/output.c
diff --git a/output.h b/src/output.h
index 640b457..640b457 100644
--- a/output.h
+++ b/src/output.h
diff --git a/schedule.c b/src/schedule.c
index d13a9c9..d13a9c9 100644
--- a/schedule.c
+++ b/src/schedule.c
diff --git a/schedule.h b/src/schedule.h
index f2e6363..f2e6363 100644
--- a/schedule.h
+++ b/src/schedule.h
diff --git a/test/deco_test.c b/test/deco_test.c
index 0b492f2..2931f44 100644
--- a/test/deco_test.c
+++ b/test/deco_test.c
@@ -1,6 +1,6 @@
 #include "minunit.h"
 
-#include "../deco.h"
+#include "../src/deco.h"
 
 MU_TEST(test_bar_to_msw)
 {