changed structure of packages