Restructure to split items module into more modules