Consolidation of Wave folder