Re-factor module index to maintain old "simple" interface.