wip on pkging

Change-Id: Ic8fe9879dd078c1c5aaf7b9facf8a4718a35dea6