Beginning the massive refactoring and consolidation.
New file structure