Finish Organizing

Finish organizing the generated code