Refactored model objects to be standard JavaBeans.