Begin work of splitting out moduleManager