Templates changes

Split classes and resources in different modules