moved several modules into a switch