Adding back subdirectory layout for templates