Minor minor improvements
Structure reorganizing. Starting multiplexing.