diff --git a/Tests/Makefile b/Tests/Makefile
index 2e29d24..f338acc 100644
--- a/Tests/Makefile
+++ b/Tests/Makefile
@@ -15,7 +15,9 @@ dstargateway_tests: ../VersionInfo/GitVersion.h $(OBJS) ../APRS/APRS.a ../IRCDDB
 
 .PHONY clean :
 clean :
-	@$(RM) *.o *.d dstargateway_tests
+	find . -name "*.o" -type f -delete
+	find . -name "*.d" -type f -delete
+	$(RM) *.o *.d dstargateway_tests
 
 ../APRS/APRS.a:
 ../Common/Common.a:
diff --git a/Tests/ProgramArgs.cpp b/Tests/ProgramArgs/ProgramArgs.cpp
similarity index 100%
rename from Tests/ProgramArgs.cpp
rename to Tests/ProgramArgs/ProgramArgs.cpp