Move app out of generators