switched the dir structure up to support psr-4