rearranging, renaming and cleaning up