Changed file structure to PSR-4