Refactor folders