fix package organization