made some updates to package format