More consistent arrangement of base templates.
Made template overriding more consistent and created template_overrides dir.