Major commit with updates to files and a reorganized file structure with a makefile