Organize Display imports
Remove unnecessary imports from display
Put testitems in an items module