1. more precious class names for controller tree
2. fixed formatting in generator template files