refactoring some module definitions in order to get proper timing numbers in RBM

Change-Id: I7d7134343b1c66381f117c5570ef3ce56adaf25a