Moved base templates to correct locations