Module routing

Change-Id: I803888b9311c385f7857b4a70644bb840b39437a