Refactor and redesign domains

line separator?