* Bring in more consistency into the file structure and file naming
* Streamlining code for improving data encapsulation between modules
* Split code into logical modules
* General cleanup