restructured facility module and wired it up again