Moved templates under the main project