Update to Psr4 compliant structure