Rename and restructure to make more sense