Moving Domain to Modules
Fixed conflicts in merge