Refactored the main classes into two packages: model and data.