structure by domain, not by techo-function

structure by domain, not by techo-function