Refactoring packages to more sensible structure

Change-Id: I906cd2e3fd5d99d2d76416a9505613b8cd1974c9