WIP: Convert namspacing to PSR0 for composer/autoloading