adjust package organization