Increased modularity in Moist