Modify Makefile
Organize new project architecture