- restructure packages