Refactor folder structures