Moved domain models into domain
Rewrote specs to comply with English as default language