Initial moving of templates to main application