refactored a bit to move items to the items folder