Refactor folder & items models and tests