Some renaming of files

Files now properly order when looking at them.