Cutting the old stuff out of Event and shaping up the Module interface