Moved around files to directories, updated makefile