Renamed files to fit in better with PSR format