restructure packages and imports