Refactor subfolder structure