Generalize shapes into classes in util/modelBuilder.js

[vabold]

This will almost certainly make development much easier for new contributors in the future.