Refractored modules into options object, instead of hardcoded