rename and restructure thigns