Changed folder structure
Changed Makefile