Refactor folders hierarchy