Implementing Modularity Changes to the Editor Code