more progress in reworking document package