Move chorus context and move subsystem classes to appropriate modules