Organize folder structure
Update Makefile