refactor: Separated channels for data and info -- Moved/copied classes