Fixed index references to modules.

Placed references closer to usage.
2 files changed