Loading optimisations, file renaming, pruning.

Don't tell us to make it work first.