Changing project structure and makefile