Moved templates into the default subdirectory