restructure of packages