Move base.html up one level, remove unused version of base.html