Modularizing, reorganizing.