Fix problems in prior commits
Continue reshuffling the templates...
Made a private class private