Cleaning up...
Restructure to follow PSR-0 standards
Added namespaces