Re-organized files, updated Makefile