Normalizing Old Filenames

Preparation for PSR-4 Changes