add modulesDir back in
add default option for modulesDir
merging