Eliminate the subfolder structure and move everything top-level.