Splintered models for better organization.
Merge pull request #6 from Ateoto/model-refactor

Splintered models for better organization.