Moved to new module setup

Signed-off-by: Bert Hajee <hajee@moretIA.com>