rearranged base-templates, grouped templates into shared