Separate out packages into own class

Change-Id: I9c0fb024496414e9de70b6b57e7f2158ca8c9de7