Start moving to a common modules/ directory of only the used modules.