Moved several files to a new folder, and some renames of objects.