Restructure item builder
Better names for things