moved project to subdirectory and rewrote whole makefile to work better