Refactor folder structure.