Refactored package names

Change-Id: I29f4bbdc3ba3a7f4a9118d656220a8713788eb16