rework packaging to use main package