reorganized apps and all apps in a new model