Move templates into the app namespace from the addon one