rename and restructure