Move modules to facilitate direct require() calls