Update code generator templates and folder heirarchy