Refactor folder architecture