- restucture packages