cleanup: some smaller cleanups, packages reorganizing

Change-Id: Iaf4cc4938c16f58adf20bb99d1d40fed33c19d10