Changed folder structure, added a new Makefile