consolidate

Smart file consolidation and module merging with systematic safety measures