Code Cleanup Round 1

Cleaning up and Organizing Code and File Structure