rename and restructure packages