WINDUP-109: Major refactor of Model classes and general cleanup

Architecture tests currently failing due to some Groovy classloading issue. Not exactly sure why, but... the rest is good.