structured packages, removed unnecessary dependencies