Reorganize folder design