bundled more modules; removed cp