Refactor package names and Maven project names

Change-Id: Ib5324b8e8b6a0bff60c8105c7aafbbbf6f4ca22a