adjusted package export to the new package sturcture