use new module layout & make tests suite pass again