Moved files to conform to PSR-4