Moving the model to new data classes
Refactoring
Moving functionality into new classes; links in lists