Fixed namespacing to be PSR-4 conform