Moving more modules into the items package.