Changed folder structure & makefile