Homeland Security puts pieces in place for infrastructure consolidation