More renaming and package moves