More systematic organization of packages and objects