Issue: Templates moved into folder, club theming