Update to new module organization of code