Moved the models into the servicode code, minus the getters.