Rearranged source into folders, broke up makefile