Extract packages to own file for more flexibility