Organize #2
Description
The organization of the simulation is rather messy, and the Makefile is unnecessarily complicated. It would be nice to organize the directory structure and alter the Makefile and environment variables accordingly to clean it up a bit.