Added folder structure and updated Makefile