Moved all templates to app directories. They get auto-discovered with no problems.
Also mostly finished automated badge testing.