interim push for generator refactoring and setup for inspector generator
resolved conflicts