Big cleanup, esp moving templates around
Big cleanup, esp moving templates around (2)