Refactor package names

Change-Id: I9eeb5c8ab7c6b08a8b1d2e6138985bcf1bb09b02