move packaging around to work on REST stuff