Refactor folder structure