Conformed to PSR-4, added base namespace to base classes