EXTSCRIPT-154: Code Rewrite/Refactoring, moving packages into core to get a cleaner submodule distinction