Further modularization changes

Change-Id: I028878d3198273af7be40bf91e805a6525e0bacb