Move Module class into types module