Working on making it work with the new module organization