Design review

Removed some business aspects from the model
Javadoc