Moved templates into their module directories