Refactor the folders