massive renaming and restructuring of things.