Denesting... (Remove some nesting in ModelBuilder classes)

No real code change here, just un-nesting some classes to make the code easier to work with.