Improved Makefile & changed project dir structure