Rearranging package declarations

Change-Id: Ifab65b9f284aa092fde3c47d801b26a981bc6db2