fw #20: fix compile
fw #20: move modules to subdir