Put all packages in separate class

Change-Id: I6566af0af475cc9d1394189a5da6eaa501bc2382