Moved Items to new class