Self-documentating folder restructure.
Improved namespacing and Object Oriented structure.