Refactored module organization for pypi.

Change-Id: Ib6a1dd2614196ed3f8cfc44ed1de3fec7adcfada