Code split into controller & generator
Code split into controller & generator