Restructured template inheritance, renamed files