Changed directory structure to match PSR-4