Adding Service Layer classes and remodeling model and data infrastructure