Moving into new folder structure.
Renaming various objects.