Updated Makefile, moved source code into folders.