Regrouped Editor code into a single object