Update subpackage names
Moved CodeMirror loading script to separate file
More code refactoring