Makefile and restructure project
Makefile and restructure project