Initial reorganization

This is just an initial reorganization of the files. The only code that has changed is to compensate for the moved files.

I will be working on a code cleanup & submitting that in another pull request..