Fit module defs and paths to new structure.