Renamed some files. Revert here if git file tracking goes crazy. Currently broken, beware.