Split OTT stuff into modules