Changes to folder structure + makefile