Separate out packages into own class

Change-Id: I68928c49032f16d402fe79e16f8f435e9e317c7f