new folder structure and Makefile