Make domain module instead of package
Demote packages to modules
Finish demoting packages to modules
Merge branch 'modularization'