Shuffling files and renaming, trying to get some order to the layout.