Further edits to file structure and makefile