refactor folder structure.