Add finished version of MakeItModular