Renaming and reorganizing to better organize everything.