Minor tweaks
Created dedicated "Services" namespace to match assembly name
Merged Model into Store