Reorganize base templates