Changed file structure to match PSR-4