Move gapps to separate package