moved module/hw fields around