Removed core and lots of changes to domain model