Renaming files for PSR-0 support
merging