Implement "Move packages into extras"

/#/c/511/

Change-Id: I8b6cd2900fa045e26efb7d0cc4536b788023ff44