Implemented Service Layer

Refactoring and minor updates to Domain Model. Implemented Service
Layer.