re-organize templates