refactor folder structure