Moved model class into different package so they can be split off into separate jars.
Renamed catalogue-model.