dw: renamed all packages to new naming format