Move around stuff.
More renaming.
Fix minor things to work with the latest engine updates.