Intermediate commit
Updated src structure and Makefile

Updated to a working Makefile and updated src structure accordingly