restructure packages and content