caos-language-server 0.1.5 → 0.1.6

package/dist/node/server.cjs

@@ -102135,10 +102135,10 @@ function readVarint32SlowPath($this) {
 
 /***/ },
 
-/***/ "../caos-util/lib/caos2/caos2-util.js"
-/*!********************************************!*\
-  !*** ../caos-util/lib/caos2/caos2-util.js ***!
-  \********************************************/
+/***/ "../caos/dist/caos2/caos2-util.js"
+/*!****************************************!*\
+  !*** ../caos/dist/caos2/caos2-util.js ***!
+  \****************************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -102147,7 +102147,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   Caos2ValueType: () => (/* binding */ Caos2ValueType),
 /* harmony export */   validateCaos2Value: () => (/* binding */ validateCaos2Value)
 /* harmony export */ });
-/* harmony import */ var _caos2_validators_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./caos2.validators.js */ "../caos-util/lib/caos2/caos2.validators.js");
+/* harmony import */ var _caos2_validators_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./caos2.validators.js */ "../caos/dist/caos2/caos2.validators.js");
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/path.js");
 
 
@@ -102163,7 +102163,7 @@ var Caos2ValueType;
     Caos2ValueType[Caos2ValueType["DATE"] = 7] = "DATE";
     Caos2ValueType[Caos2ValueType["EMAIL"] = 8] = "EMAIL";
     Caos2ValueType[Caos2ValueType["URL"] = 9] = "URL";
-})(Caos2ValueType || (Caos2ValueType = {}));
+})(Caos2ValueType = Caos2ValueType || (Caos2ValueType = {}));
 function validateCaos2Value(type, value) {
     var _a, _b, _c, _d, _e, _f;
     switch (type) {
@@ -102195,10 +102195,10 @@ function validateCaos2Value(type, value) {
 
 /***/ },
 
-/***/ "../caos-util/lib/caos2/caos2.validators.js"
-/*!**************************************************!*\
-  !*** ../caos-util/lib/caos2/caos2.validators.js ***!
-  \**************************************************/
+/***/ "../caos/dist/caos2/caos2.validators.js"
+/*!**********************************************!*\
+  !*** ../caos/dist/caos2/caos2.validators.js ***!
+  \**********************************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -102297,10 +102297,10 @@ function isFile(value) {
 
 /***/ },
 
-/***/ "../caos-util/lib/caos2/caos2cob.formats.js"
-/*!**************************************************!*\
-  !*** ../caos-util/lib/caos2/caos2cob.formats.js ***!
-  \**************************************************/
+/***/ "../caos/dist/caos2/caos2cob.formats.js"
+/*!**********************************************!*\
+  !*** ../caos/dist/caos2/caos2cob.formats.js ***!
+  \**********************************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -102308,7 +102308,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   Caos2CobFormats: () => (/* binding */ Caos2CobFormats)
 /* harmony export */ });
-/* harmony import */ var _caos2_validators_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./caos2.validators.js */ "../caos-util/lib/caos2/caos2.validators.js");
+/* harmony import */ var _caos2_validators_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./caos2.validators.js */ "../caos/dist/caos2/caos2.validators.js");
 
 const Caos2CobFormats = {
     STRING: { formatDescriptor: "string", validate: _caos2_validators_js__WEBPACK_IMPORTED_MODULE_0__.Caos2Validators.isString },
@@ -102326,10 +102326,10 @@ const Caos2CobFormats = {
 
 /***/ },
 
-/***/ "../caos-util/lib/caos2/caos2cob.js"
-/*!******************************************!*\
-  !*** ../caos-util/lib/caos2/caos2cob.js ***!
-  \******************************************/
+/***/ "../caos/dist/caos2/caos2cob.js"
+/*!**************************************!*\
+  !*** ../caos/dist/caos2/caos2cob.js ***!
+  \**************************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -102338,8 +102338,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   CAOS2COB_TAGS: () => (/* binding */ CAOS2COB_TAGS),
 /* harmony export */   findCobTag: () => (/* binding */ findCobTag)
 /* harmony export */ });
-/* harmony import */ var _caos2cob_formats_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./caos2cob.formats.js */ "../caos-util/lib/caos2/caos2cob.formats.js");
-/* harmony import */ var _caos2_util_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./caos2-util.js */ "../caos-util/lib/caos2/caos2-util.js");
+/* harmony import */ var _caos2cob_formats_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./caos2cob.formats.js */ "../caos/dist/caos2/caos2cob.formats.js");
+/* harmony import */ var _caos2_util_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./caos2-util.js */ "../caos/dist/caos2/caos2-util.js");
 
 
 const CAOS2COB_TAGS = [
@@ -102457,10 +102457,10 @@ function findCobTag(tag) {
 
 /***/ },
 
-/***/ "../caos-util/lib/caos2/caos2pray-definitions.js"
-/*!*******************************************************!*\
-  !*** ../caos-util/lib/caos2/caos2pray-definitions.js ***!
-  \*******************************************************/
+/***/ "../caos/dist/caos2/caos2pray-definitions.js"
+/*!***************************************************!*\
+  !*** ../caos/dist/caos2/caos2pray-definitions.js ***!
+  \***************************************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -102578,10 +102578,10 @@ function isOfficialTag(tag) {
 
 /***/ },
 
-/***/ "../caos-util/lib/command-call-positional-data.js"
-/*!********************************************************!*\
-  !*** ../caos-util/lib/command-call-positional-data.js ***!
-  \********************************************************/
+/***/ "../caos/dist/command-call-positional-data.js"
+/*!****************************************************!*\
+  !*** ../caos/dist/command-call-positional-data.js ***!
+  \****************************************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -102590,7 +102590,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   getCommandCallPositionalDataFromParseResult: () => (/* binding */ getCommandCallPositionalDataFromParseResult)
 /* harmony export */ });
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/position-utils.js");
-/* harmony import */ var _drillDown_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./drillDown.js */ "../caos-util/lib/drillDown.js");
+/* harmony import */ var _drillDown_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./drillDown.js */ "../caos/dist/drillDown.js");
 /* harmony import */ var _creatures_lsp_caos_kt_caos_cursor_data__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @creatures-lsp/caos-kt/caos-cursor-data */ "../caos-kt/dist/caos-cursor-data.mjs");
 
 
@@ -102629,10 +102629,10 @@ function getCommandCallPositionalDataFromParseResult(parseResult, position) {
 
 /***/ },
 
-/***/ "../caos-util/lib/commands.js"
-/*!************************************!*\
-  !*** ../caos-util/lib/commands.js ***!
-  \************************************/
+/***/ "../caos/dist/commands.js"
+/*!********************************!*\
+  !*** ../caos/dist/commands.js ***!
+  \********************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -102666,10 +102666,10 @@ function getCommands(variant) {
 
 /***/ },
 
-/***/ "../caos-util/lib/completion/caos2/completions.caos2.command.js"
-/*!**********************************************************************!*\
-  !*** ../caos-util/lib/completion/caos2/completions.caos2.command.js ***!
-  \**********************************************************************/
+/***/ "../caos/dist/completion/caos2/completions.caos2.command.js"
+/*!******************************************************************!*\
+  !*** ../caos/dist/completion/caos2/completions.caos2.command.js ***!
+  \******************************************************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -102678,7 +102678,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   getCaos2CommandCompletions: () => (/* binding */ getCaos2CommandCompletions)
 /* harmony export */ });
 /* harmony import */ var vscode_languageserver_types__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! vscode-languageserver-types */ "../../node_modules/vscode-languageserver-types/lib/esm/main.js");
-/* harmony import */ var _completions_create_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../completions.create.js */ "../caos-util/lib/completion/completions.create.js");
+/* harmony import */ var _completions_create_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../completions.create.js */ "../caos/dist/completion/completions.create.js");
 
 
 // noinspection DuplicatedCode
@@ -102766,10 +102766,10 @@ function getC3DSCommandCompletions(commandsSoFar, token) {
 
 /***/ },
 
-/***/ "../caos-util/lib/completion/caos2/completions.caos2.js"
-/*!**************************************************************!*\
-  !*** ../caos-util/lib/completion/caos2/completions.caos2.js ***!
-  \**************************************************************/
+/***/ "../caos/dist/completion/caos2/completions.caos2.js"
+/*!**********************************************************!*\
+  !*** ../caos/dist/completion/caos2/completions.caos2.js ***!
+  \**********************************************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -102778,9 +102778,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   getCaos2PrayCompletions: () => (/* binding */ getCaos2PrayCompletions)
 /* harmony export */ });
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/position-utils.js");
-/* harmony import */ var _completions_caos2_tag_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./completions.caos2.tag.js */ "../caos-util/lib/completion/caos2/completions.caos2.tag.js");
-/* harmony import */ var _completions_caos2_values_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./completions.caos2.values.js */ "../caos-util/lib/completion/caos2/completions.caos2.values.js");
-/* harmony import */ var _completions_caos2_command_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./completions.caos2.command.js */ "../caos-util/lib/completion/caos2/completions.caos2.command.js");
+/* harmony import */ var _completions_caos2_tag_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./completions.caos2.tag.js */ "../caos/dist/completion/caos2/completions.caos2.tag.js");
+/* harmony import */ var _completions_caos2_values_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./completions.caos2.values.js */ "../caos/dist/completion/caos2/completions.caos2.values.js");
+/* harmony import */ var _completions_caos2_command_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./completions.caos2.command.js */ "../caos/dist/completion/caos2/completions.caos2.command.js");
 var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -102805,8 +102805,8 @@ var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _argume
  * @param options
  */
 function getCaos2PrayCompletions(thisFileName, variant, allComments, item, line, character, options) {
+    var _a, _b, _c, _d, _e, _f, _g;
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g;
         let out = [];
         // Get type of comment
         const isCommand = item.command != null && item.tag == null;
@@ -102854,10 +102854,10 @@ function getCaos2PrayCompletions(thisFileName, variant, allComments, item, line,
 
 /***/ },
 
-/***/ "../caos-util/lib/completion/caos2/completions.caos2.tag.js"
-/*!******************************************************************!*\
-  !*** ../caos-util/lib/completion/caos2/completions.caos2.tag.js ***!
-  \******************************************************************/
+/***/ "../caos/dist/completion/caos2/completions.caos2.tag.js"
+/*!**************************************************************!*\
+  !*** ../caos/dist/completion/caos2/completions.caos2.tag.js ***!
+  \**************************************************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -102866,9 +102866,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   getCaos2TagCompletions: () => (/* binding */ getCaos2TagCompletions)
 /* harmony export */ });
 /* harmony import */ var vscode_languageserver_types__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! vscode-languageserver-types */ "../../node_modules/vscode-languageserver-types/lib/esm/main.js");
-/* harmony import */ var _completions_caos2cob_tags_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./completions.caos2cob.tags.js */ "../caos-util/lib/completion/caos2/completions.caos2cob.tags.js");
-/* harmony import */ var _caos2_caos2pray_definitions_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../caos2/caos2pray-definitions.js */ "../caos-util/lib/caos2/caos2pray-definitions.js");
-/* harmony import */ var _completions_create_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../completions.create.js */ "../caos-util/lib/completion/completions.create.js");
+/* harmony import */ var _completions_caos2cob_tags_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./completions.caos2cob.tags.js */ "../caos/dist/completion/caos2/completions.caos2cob.tags.js");
+/* harmony import */ var _caos2_caos2pray_definitions_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../caos2/caos2pray-definitions.js */ "../caos/dist/caos2/caos2pray-definitions.js");
+/* harmony import */ var _completions_create_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../completions.create.js */ "../caos/dist/completion/completions.create.js");
 
 
 
@@ -102894,10 +102894,10 @@ function getCaos2TagCompletions(variant, allComments, hasEQ, range) {
 
 /***/ },
 
-/***/ "../caos-util/lib/completion/caos2/completions.caos2.values.js"
-/*!*********************************************************************!*\
-  !*** ../caos-util/lib/completion/caos2/completions.caos2.values.js ***!
-  \*********************************************************************/
+/***/ "../caos/dist/completion/caos2/completions.caos2.values.js"
+/*!*****************************************************************!*\
+  !*** ../caos/dist/completion/caos2/completions.caos2.values.js ***!
+  \*****************************************************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -102907,9 +102907,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ });
 /* harmony import */ var vscode_languageserver_types__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! vscode-languageserver-types */ "../../node_modules/vscode-languageserver-types/lib/esm/main.js");
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/position-utils.js");
-/* harmony import */ var _completions_caos2cob_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./completions.caos2cob.js */ "../caos-util/lib/completion/caos2/completions.caos2cob.js");
-/* harmony import */ var _completions_caos2pray_values_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./completions.caos2pray.values.js */ "../caos-util/lib/completion/caos2/completions.caos2pray.values.js");
-/* harmony import */ var _completions_create_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../completions.create.js */ "../caos-util/lib/completion/completions.create.js");
+/* harmony import */ var _completions_caos2cob_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./completions.caos2cob.js */ "../caos/dist/completion/caos2/completions.caos2cob.js");
+/* harmony import */ var _completions_caos2pray_values_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./completions.caos2pray.values.js */ "../caos/dist/completion/caos2/completions.caos2pray.values.js");
+/* harmony import */ var _completions_create_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../completions.create.js */ "../caos/dist/completion/completions.create.js");
 var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -102925,8 +102925,8 @@ var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _argume
 
 
 function getCaos2TagValueCompletions(thisFileName, variant, comment, allComments, line, character, options) {
+    var _a, _b, _c, _d;
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
         let range = (_b = (_a = comment
             .values
             .find((v) => (0,_creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_1__.inRange)(v.textRange, line, character, false, true))) === null || _a === void 0 ? void 0 : _a.textRange) !== null && _b !== void 0 ? _b : {
@@ -102963,10 +102963,10 @@ function getCaos2TagValueCompletions(thisFileName, variant, comment, allComments
 
 /***/ },
 
-/***/ "../caos-util/lib/completion/caos2/completions.caos2cob.js"
-/*!*****************************************************************!*\
-  !*** ../caos-util/lib/completion/caos2/completions.caos2cob.js ***!
-  \*****************************************************************/
+/***/ "../caos/dist/completion/caos2/completions.caos2cob.js"
+/*!*************************************************************!*\
+  !*** ../caos/dist/completion/caos2/completions.caos2cob.js ***!
+  \*************************************************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -102975,9 +102975,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   getC1TagValueCompletions: () => (/* binding */ getC1TagValueCompletions),
 /* harmony export */   getC2TagValueCompletions: () => (/* binding */ getC2TagValueCompletions)
 /* harmony export */ });
-/* harmony import */ var _caos2_caos2cob_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../caos2/caos2cob.js */ "../caos-util/lib/caos2/caos2cob.js");
-/* harmony import */ var _caos2_caos2_util_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../caos2/caos2-util.js */ "../caos-util/lib/caos2/caos2-util.js");
-/* harmony import */ var _completions_file_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../completions.file.js */ "../caos-util/lib/completion/completions.file.js");
+/* harmony import */ var _caos2_caos2cob_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../caos2/caos2cob.js */ "../caos/dist/caos2/caos2cob.js");
+/* harmony import */ var _caos2_caos2_util_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../caos2/caos2-util.js */ "../caos/dist/caos2/caos2-util.js");
+/* harmony import */ var _completions_file_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../completions.file.js */ "../caos/dist/completion/completions.file.js");
 var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -103034,10 +103034,10 @@ function getC2TagValueCompletions(thisFileName, tag, command, directory, getFile
 
 /***/ },
 
-/***/ "../caos-util/lib/completion/caos2/completions.caos2cob.tags.js"
-/*!**********************************************************************!*\
-  !*** ../caos-util/lib/completion/caos2/completions.caos2cob.tags.js ***!
-  \**********************************************************************/
+/***/ "../caos/dist/completion/caos2/completions.caos2cob.tags.js"
+/*!******************************************************************!*\
+  !*** ../caos/dist/completion/caos2/completions.caos2cob.tags.js ***!
+  \******************************************************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -103046,7 +103046,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   getC1TagCompletions: () => (/* binding */ getC1TagCompletions),
 /* harmony export */   getC2TagCompletions: () => (/* binding */ getC2TagCompletions)
 /* harmony export */ });
-/* harmony import */ var _caos2_caos2cob_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../caos2/caos2cob.js */ "../caos-util/lib/caos2/caos2cob.js");
+/* harmony import */ var _caos2_caos2cob_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../caos2/caos2cob.js */ "../caos/dist/caos2/caos2cob.js");
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/array-util.js");
 
 
@@ -103064,10 +103064,10 @@ function getC2TagCompletions(tagsSoFar) {
 
 /***/ },
 
-/***/ "../caos-util/lib/completion/caos2/completions.caos2pray.values.js"
-/*!*************************************************************************!*\
-  !*** ../caos-util/lib/completion/caos2/completions.caos2pray.values.js ***!
-  \*************************************************************************/
+/***/ "../caos/dist/completion/caos2/completions.caos2pray.values.js"
+/*!*********************************************************************!*\
+  !*** ../caos/dist/completion/caos2/completions.caos2pray.values.js ***!
+  \*********************************************************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -103080,7 +103080,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   requiresGenetics: () => (/* binding */ requiresGenetics),
 /* harmony export */   requiresSpriteRegex: () => (/* binding */ requiresSpriteRegex)
 /* harmony export */ });
-/* harmony import */ var _completions_file_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../completions.file.js */ "../caos-util/lib/completion/completions.file.js");
+/* harmony import */ var _completions_file_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../completions.file.js */ "../caos/dist/completion/completions.file.js");
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/array-util.js");
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/files-util.js");
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/string-util.js");
@@ -103262,8 +103262,8 @@ function getSpriteTagValueCompletions(tag, inlinedOrDepended, getFiles) {
     });
 }
 function getAllFileNames(extensions, inlinedOrDepended, getFiles) {
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
-        var _a;
         const allFileNames = inlinedOrDepended.map(file => (0,_creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_2__.getFileName)(file));
         for (let file of (yield getFiles(extensions))) {
             file = (_a = (0,_creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_2__.getFileName)(file)) !== null && _a !== void 0 ? _a : file;
@@ -103298,10 +103298,10 @@ function getCommandValues(commands, ...commandKinds) {
 
 /***/ },
 
-/***/ "../caos-util/lib/completion/command-to-completion-item.js"
-/*!*****************************************************************!*\
-  !*** ../caos-util/lib/completion/command-to-completion-item.js ***!
-  \*****************************************************************/
+/***/ "../caos/dist/completion/command-to-completion-item.js"
+/*!*************************************************************!*\
+  !*** ../caos/dist/completion/command-to-completion-item.js ***!
+  \*************************************************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -103312,7 +103312,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _creatures_lsp_caos_kt_caos_libs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos-kt/caos-libs */ "../caos-kt/dist/caos-libs.mjs");
 /* harmony import */ var vscode_languageserver_types__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! vscode-languageserver-types */ "../../node_modules/vscode-languageserver-types/lib/esm/main.js");
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/repack.js");
-/* harmony import */ var _token_utils_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../token-utils.js */ "../caos-util/lib/token-utils.js");
+/* harmony import */ var _token_utils_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../token-utils.js */ "../caos/dist/token-utils.js");
 
 
 
@@ -103377,10 +103377,10 @@ function formatParameterSnippet(parameter) {
 
 /***/ },
 
-/***/ "../caos-util/lib/completion/completion.catalogue.js"
-/*!***********************************************************!*\
-  !*** ../caos-util/lib/completion/completion.catalogue.js ***!
-  \***********************************************************/
+/***/ "../caos/dist/completion/completion.catalogue.js"
+/*!*******************************************************!*\
+  !*** ../caos/dist/completion/completion.catalogue.js ***!
+  \*******************************************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -103388,8 +103388,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   getCatalogueNameCompletions: () => (/* binding */ getCatalogueNameCompletions)
 /* harmony export */ });
-/* harmony import */ var _is_similar_variant_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../is-similar-variant.js */ "../caos-util/lib/is-similar-variant.js");
-/* harmony import */ var _completion_createNameCompletionItem_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./completion.createNameCompletionItem.js */ "../caos-util/lib/completion/completion.createNameCompletionItem.js");
+/* harmony import */ var _is_similar_variant_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../is-similar-variant.js */ "../caos/dist/is-similar-variant.js");
+/* harmony import */ var _completion_createNameCompletionItem_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./completion.createNameCompletionItem.js */ "../caos/dist/completion/completion.createNameCompletionItem.js");
 
 
 function isCatalogueNameCommand(variant, commandString) {
@@ -103424,10 +103424,10 @@ function getCatalogueNameCompletions(variant, commandCall, parameterIndex, getCa
 
 /***/ },
 
-/***/ "../caos-util/lib/completion/completion.command.js"
-/*!*********************************************************!*\
-  !*** ../caos-util/lib/completion/completion.command.js ***!
-  \*********************************************************/
+/***/ "../caos/dist/completion/completion.command.js"
+/*!*****************************************************!*\
+  !*** ../caos/dist/completion/completion.command.js ***!
+  \*****************************************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -103439,13 +103439,13 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   getDumbCompletionItems: () => (/* binding */ getDumbCompletionItems)
 /* harmony export */ });
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/lsp-runner.js");
-/* harmony import */ var _constants_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../constants.js */ "../caos-util/lib/constants.js");
-/* harmony import */ var _is_similar_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../is-similar.js */ "../caos-util/lib/is-similar.js");
-/* harmony import */ var _completions_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../completions.js */ "../caos-util/lib/completions.js");
-/* harmony import */ var _command_to_completion_item_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./command-to-completion-item.js */ "../caos-util/lib/completion/command-to-completion-item.js");
-/* harmony import */ var _completions_lvalue_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./completions.lvalue.js */ "../caos-util/lib/completion/completions.lvalue.js");
-/* harmony import */ var _completions_rvalue_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./completions.rvalue.js */ "../caos-util/lib/completion/completions.rvalue.js");
-/* harmony import */ var _token_utils_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../token-utils.js */ "../caos-util/lib/token-utils.js");
+/* harmony import */ var _constants_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../constants.js */ "../caos/dist/constants.js");
+/* harmony import */ var _is_similar_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../is-similar.js */ "../caos/dist/is-similar.js");
+/* harmony import */ var _completions_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../completions.js */ "../caos/dist/completions.js");
+/* harmony import */ var _command_to_completion_item_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./command-to-completion-item.js */ "../caos/dist/completion/command-to-completion-item.js");
+/* harmony import */ var _completions_lvalue_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./completions.lvalue.js */ "../caos/dist/completion/completions.lvalue.js");
+/* harmony import */ var _completions_rvalue_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./completions.rvalue.js */ "../caos/dist/completion/completions.rvalue.js");
+/* harmony import */ var _token_utils_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../token-utils.js */ "../caos/dist/token-utils.js");
 
 
 
@@ -103732,10 +103732,10 @@ function postProcessPlaceholderCompletions(raw, edit) {
 
 /***/ },
 
-/***/ "../caos-util/lib/completion/completion.createNameCompletionItem.js"
-/*!**************************************************************************!*\
-  !*** ../caos-util/lib/completion/completion.createNameCompletionItem.js ***!
-  \**************************************************************************/
+/***/ "../caos/dist/completion/completion.createNameCompletionItem.js"
+/*!**********************************************************************!*\
+  !*** ../caos/dist/completion/completion.createNameCompletionItem.js ***!
+  \**********************************************************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -103778,10 +103778,10 @@ function getNameCompletionItems(names, closestItem, completionKind = vscode_lang
 
 /***/ },
 
-/***/ "../caos-util/lib/completion/completion.journal.js"
-/*!*********************************************************!*\
-  !*** ../caos-util/lib/completion/completion.journal.js ***!
-  \*********************************************************/
+/***/ "../caos/dist/completion/completion.journal.js"
+/*!*****************************************************!*\
+  !*** ../caos/dist/completion/completion.journal.js ***!
+  \*****************************************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -103789,9 +103789,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   getJournalNameCompletions: () => (/* binding */ getJournalNameCompletions)
 /* harmony export */ });
-/* harmony import */ var _is_similar_variant_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../is-similar-variant.js */ "../caos-util/lib/is-similar-variant.js");
-/* harmony import */ var _is_util_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../is-util.js */ "../caos-util/lib/is-util.js");
-/* harmony import */ var _completion_createNameCompletionItem_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./completion.createNameCompletionItem.js */ "../caos-util/lib/completion/completion.createNameCompletionItem.js");
+/* harmony import */ var _is_similar_variant_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../is-similar-variant.js */ "../caos/dist/is-similar-variant.js");
+/* harmony import */ var _is_util_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../is-util.js */ "../caos/dist/is-util.js");
+/* harmony import */ var _completion_createNameCompletionItem_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./completion.createNameCompletionItem.js */ "../caos/dist/completion/completion.createNameCompletionItem.js");
 
 
 
@@ -103833,10 +103833,10 @@ function getJournalNameCompletions(variant, commandCall, parameterIndex, getJour
 
 /***/ },
 
-/***/ "../caos-util/lib/completion/completion.namedVariables.js"
-/*!****************************************************************!*\
-  !*** ../caos-util/lib/completion/completion.namedVariables.js ***!
-  \****************************************************************/
+/***/ "../caos/dist/completion/completion.namedVariables.js"
+/*!************************************************************!*\
+  !*** ../caos/dist/completion/completion.namedVariables.js ***!
+  \************************************************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -103845,7 +103845,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   getNamedVariableCompletionItems: () => (/* binding */ getNamedVariableCompletionItems)
 /* harmony export */ });
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/get-workspace-edits.js");
-/* harmony import */ var _completion_createNameCompletionItem_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./completion.createNameCompletionItem.js */ "../caos-util/lib/completion/completion.createNameCompletionItem.js");
+/* harmony import */ var _completion_createNameCompletionItem_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./completion.createNameCompletionItem.js */ "../caos/dist/completion/completion.createNameCompletionItem.js");
 
 
 function isNamedVariableCommand(variant, commandString) {
@@ -103878,10 +103878,10 @@ function getNamedVariableCompletionItems(variant, commandCall, parameterIndex, g
 
 /***/ },
 
-/***/ "../caos-util/lib/completion/completions.bitflags.js"
-/*!***********************************************************!*\
-  !*** ../caos-util/lib/completion/completions.bitflags.js ***!
-  \***********************************************************/
+/***/ "../caos/dist/completion/completions.bitflags.js"
+/*!*******************************************************!*\
+  !*** ../caos/dist/completion/completions.bitflags.js ***!
+  \*******************************************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -103890,7 +103890,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   getBitflagsOptionsProvider: () => (/* binding */ getBitflagsOptionsProvider)
 /* harmony export */ });
 /* harmony import */ var _creatures_lsp_caos_kt_caos_libs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos-kt/caos-libs */ "../caos-kt/dist/caos-libs.mjs");
-/* harmony import */ var _completions_values_list_values_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./completions.values-list-values.js */ "../caos-util/lib/completion/completions.values-list-values.js");
+/* harmony import */ var _completions_values_list_values_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./completions.values-list-values.js */ "../caos/dist/completion/completions.values-list-values.js");
 
 
 function getBitflagsOptionsProvider(data) {
@@ -103945,10 +103945,10 @@ function isValuesListBitflag(valuesList) {
 
 /***/ },
 
-/***/ "../caos-util/lib/completion/completions.create.js"
-/*!*********************************************************!*\
-  !*** ../caos-util/lib/completion/completions.create.js ***!
-  \*********************************************************/
+/***/ "../caos/dist/completion/completions.create.js"
+/*!*****************************************************!*\
+  !*** ../caos/dist/completion/completions.create.js ***!
+  \*****************************************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -104003,10 +104003,10 @@ function createQuotedCompletionItem(token, range, completionKind = vscode_langua
 
 /***/ },
 
-/***/ "../caos-util/lib/completion/completions.file.js"
-/*!*******************************************************!*\
-  !*** ../caos-util/lib/completion/completions.file.js ***!
-  \*******************************************************/
+/***/ "../caos/dist/completion/completions.file.js"
+/*!***************************************************!*\
+  !*** ../caos/dist/completion/completions.file.js ***!
+  \***************************************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -104018,7 +104018,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var vscode_languageserver_types__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! vscode-languageserver-types */ "../../node_modules/vscode-languageserver-types/lib/esm/main.js");
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/files-util.js");
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/path.js");
-/* harmony import */ var _completions_create_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./completions.create.js */ "../caos-util/lib/completion/completions.create.js");
+/* harmony import */ var _completions_create_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./completions.create.js */ "../caos/dist/completion/completions.create.js");
 
 
 
@@ -104054,10 +104054,10 @@ function getFilenameCompletionPaths(directory, filesInProject, extensions) {
 
 /***/ },
 
-/***/ "../caos-util/lib/completion/completions.indexedVariables.js"
-/*!*******************************************************************!*\
-  !*** ../caos-util/lib/completion/completions.indexedVariables.js ***!
-  \*******************************************************************/
+/***/ "../caos/dist/completion/completions.indexedVariables.js"
+/*!***************************************************************!*\
+  !*** ../caos/dist/completion/completions.indexedVariables.js ***!
+  \***************************************************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -104136,10 +104136,10 @@ function addVariablesOfType(completions, command, prefix, max, description = und
 
 /***/ },
 
-/***/ "../caos-util/lib/completion/completions.lvalue.js"
-/*!*********************************************************!*\
-  !*** ../caos-util/lib/completion/completions.lvalue.js ***!
-  \*********************************************************/
+/***/ "../caos/dist/completion/completions.lvalue.js"
+/*!*****************************************************!*\
+  !*** ../caos/dist/completion/completions.lvalue.js ***!
+  \*****************************************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -104147,10 +104147,10 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   getLvalueCompletions: () => (/* binding */ getLvalueCompletions)
 /* harmony export */ });
-/* harmony import */ var _constants_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../constants.js */ "../caos-util/lib/constants.js");
-/* harmony import */ var _completions_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../completions.js */ "../caos-util/lib/completions.js");
-/* harmony import */ var _completions_indexedVariables_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./completions.indexedVariables.js */ "../caos-util/lib/completion/completions.indexedVariables.js");
-/* harmony import */ var _completion_command_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./completion.command.js */ "../caos-util/lib/completion/completion.command.js");
+/* harmony import */ var _constants_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../constants.js */ "../caos/dist/constants.js");
+/* harmony import */ var _completions_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../completions.js */ "../caos/dist/completions.js");
+/* harmony import */ var _completions_indexedVariables_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./completions.indexedVariables.js */ "../caos/dist/completion/completions.indexedVariables.js");
+/* harmony import */ var _completion_command_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./completion.command.js */ "../caos/dist/completion/completion.command.js");
 
 
 
@@ -104171,10 +104171,10 @@ function getLvalueCompletions(variant, commands, position, completionSettings) {
 
 /***/ },
 
-/***/ "../caos-util/lib/completion/completions.rvalue.js"
-/*!*********************************************************!*\
-  !*** ../caos-util/lib/completion/completions.rvalue.js ***!
-  \*********************************************************/
+/***/ "../caos/dist/completion/completions.rvalue.js"
+/*!*****************************************************!*\
+  !*** ../caos/dist/completion/completions.rvalue.js ***!
+  \*****************************************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -104182,11 +104182,11 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   getRvalueCompletions: () => (/* binding */ getRvalueCompletions)
 /* harmony export */ });
-/* harmony import */ var _constants_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../constants.js */ "../caos-util/lib/constants.js");
-/* harmony import */ var _completions_values_list_values_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./completions.values-list-values.js */ "../caos-util/lib/completion/completions.values-list-values.js");
-/* harmony import */ var _completions_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../completions.js */ "../caos-util/lib/completions.js");
-/* harmony import */ var _completions_indexedVariables_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./completions.indexedVariables.js */ "../caos-util/lib/completion/completions.indexedVariables.js");
-/* harmony import */ var _completion_command_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./completion.command.js */ "../caos-util/lib/completion/completion.command.js");
+/* harmony import */ var _constants_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../constants.js */ "../caos/dist/constants.js");
+/* harmony import */ var _completions_values_list_values_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./completions.values-list-values.js */ "../caos/dist/completion/completions.values-list-values.js");
+/* harmony import */ var _completions_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../completions.js */ "../caos/dist/completions.js");
+/* harmony import */ var _completions_indexedVariables_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./completions.indexedVariables.js */ "../caos/dist/completion/completions.indexedVariables.js");
+/* harmony import */ var _completion_command_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./completion.command.js */ "../caos/dist/completion/completion.command.js");
 
 
 
@@ -104210,10 +104210,10 @@ function getRvalueCompletions(variant, commands, position, data, settings) {
 
 /***/ },
 
-/***/ "../caos-util/lib/completion/completions.subroutines.js"
-/*!**************************************************************!*\
-  !*** ../caos-util/lib/completion/completions.subroutines.js ***!
-  \**************************************************************/
+/***/ "../caos/dist/completion/completions.subroutines.js"
+/*!**********************************************************!*\
+  !*** ../caos/dist/completion/completions.subroutines.js ***!
+  \**********************************************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -104223,9 +104223,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ });
 /* harmony import */ var _creatures_lsp_caos_kt_caos_parser__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos-kt/caos-parser */ "../caos-kt/dist/caos-parser.mjs");
 /* harmony import */ var vscode_languageserver_types__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! vscode-languageserver-types */ "../../node_modules/vscode-languageserver-types/lib/esm/main.js");
-/* harmony import */ var _is_util_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../is-util.js */ "../caos-util/lib/is-util.js");
+/* harmony import */ var _is_util_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../is-util.js */ "../caos/dist/is-util.js");
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/position-utils.js");
-/* harmony import */ var _subroutines_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../subroutines.js */ "../caos-util/lib/subroutines.js");
+/* harmony import */ var _subroutines_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../subroutines.js */ "../caos/dist/subroutines.js");
 
 
 
@@ -104270,10 +104270,10 @@ function getSubroutineCompletions(variant, text, cursor) {
 
 /***/ },
 
-/***/ "../caos-util/lib/completion/completions.values-list-values.js"
-/*!*********************************************************************!*\
-  !*** ../caos-util/lib/completion/completions.values-list-values.js ***!
-  \*********************************************************************/
+/***/ "../caos/dist/completion/completions.values-list-values.js"
+/*!*****************************************************************!*\
+  !*** ../caos/dist/completion/completions.values-list-values.js ***!
+  \*****************************************************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -104323,10 +104323,10 @@ function getValuesListValueCompletionItem(value, inQuotes = false) {
 
 /***/ },
 
-/***/ "../caos-util/lib/completions.js"
-/*!***************************************!*\
-  !*** ../caos-util/lib/completions.js ***!
-  \***************************************/
+/***/ "../caos/dist/completions.js"
+/*!***********************************!*\
+  !*** ../caos/dist/completions.js ***!
+  \***********************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -104344,18 +104344,18 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ });
 /* harmony import */ var _creatures_lsp_caos_kt_caos_parser__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos-kt/caos-parser */ "../caos-kt/dist/caos-parser.mjs");
 /* harmony import */ var _creatures_lsp_caos_kt_caos_cursor_data__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/caos-kt/caos-cursor-data */ "../caos-kt/dist/caos-cursor-data.mjs");
-/* harmony import */ var _constants_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./constants.js */ "../caos-util/lib/constants.js");
-/* harmony import */ var _commands_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./commands.js */ "../caos-util/lib/commands.js");
-/* harmony import */ var _is_util_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./is-util.js */ "../caos-util/lib/is-util.js");
-/* harmony import */ var _completion_caos2_completions_caos2_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./completion/caos2/completions.caos2.js */ "../caos-util/lib/completion/caos2/completions.caos2.js");
-/* harmony import */ var _completion_completions_bitflags_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./completion/completions.bitflags.js */ "../caos-util/lib/completion/completions.bitflags.js");
-/* harmony import */ var _completion_completions_values_list_values_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./completion/completions.values-list-values.js */ "../caos-util/lib/completion/completions.values-list-values.js");
-/* harmony import */ var _completion_completion_command_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./completion/completion.command.js */ "../caos-util/lib/completion/completion.command.js");
-/* harmony import */ var _completion_completions_subroutines_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./completion/completions.subroutines.js */ "../caos-util/lib/completion/completions.subroutines.js");
-/* harmony import */ var _cursor_data_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./cursor-data.js */ "../caos-util/lib/cursor-data.js");
-/* harmony import */ var _completion_completion_namedVariables_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./completion/completion.namedVariables.js */ "../caos-util/lib/completion/completion.namedVariables.js");
-/* harmony import */ var _completion_completion_journal_js__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./completion/completion.journal.js */ "../caos-util/lib/completion/completion.journal.js");
-/* harmony import */ var _completion_completion_catalogue_js__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./completion/completion.catalogue.js */ "../caos-util/lib/completion/completion.catalogue.js");
+/* harmony import */ var _constants_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./constants.js */ "../caos/dist/constants.js");
+/* harmony import */ var _commands_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./commands.js */ "../caos/dist/commands.js");
+/* harmony import */ var _is_util_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./is-util.js */ "../caos/dist/is-util.js");
+/* harmony import */ var _completion_caos2_completions_caos2_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./completion/caos2/completions.caos2.js */ "../caos/dist/completion/caos2/completions.caos2.js");
+/* harmony import */ var _completion_completions_bitflags_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./completion/completions.bitflags.js */ "../caos/dist/completion/completions.bitflags.js");
+/* harmony import */ var _completion_completions_values_list_values_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./completion/completions.values-list-values.js */ "../caos/dist/completion/completions.values-list-values.js");
+/* harmony import */ var _completion_completion_command_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./completion/completion.command.js */ "../caos/dist/completion/completion.command.js");
+/* harmony import */ var _completion_completions_subroutines_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./completion/completions.subroutines.js */ "../caos/dist/completion/completions.subroutines.js");
+/* harmony import */ var _cursor_data_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./cursor-data.js */ "../caos/dist/cursor-data.js");
+/* harmony import */ var _completion_completion_namedVariables_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./completion/completion.namedVariables.js */ "../caos/dist/completion/completion.namedVariables.js");
+/* harmony import */ var _completion_completion_journal_js__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./completion/completion.journal.js */ "../caos/dist/completion/completion.journal.js");
+/* harmony import */ var _completion_completion_catalogue_js__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./completion/completion.catalogue.js */ "../caos/dist/completion/completion.catalogue.js");
 var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -104398,9 +104398,9 @@ function createEmptyCompletionList() {
  * @param opts
  * @param cursorPointer passes back cursor to calling method
  */
-function getCompletionItems(thisFileName_1, variant_1, text_1, position_1, opts_1) {
-    return __awaiter(this, arguments, void 0, function* (thisFileName, variant, text, position, opts, completionSettings = null, cursorPointer) {
-        var _a, _b;
+function getCompletionItems(thisFileName, variant, text, position, opts, completionSettings = null, cursorPointer) {
+    var _a, _b;
+    return __awaiter(this, void 0, void 0, function* () {
         let cursor;
         const parseResult = typeof text === "string" ? (0,_creatures_lsp_caos_kt_caos_parser__WEBPACK_IMPORTED_MODULE_0__.parseCaosNear)(variant, text, position.line, Math.max(position.character - 1, 0), (_a = opts === null || opts === void 0 ? void 0 : opts.incomplete) !== null && _a !== void 0 ? _a : true) : text;
         cursor = (0,_creatures_lsp_caos_kt_caos_cursor_data__WEBPACK_IMPORTED_MODULE_1__.getCaosCursorPosition)(parseResult, position.line, Math.max(position.character - 1, 0), (_b = opts === null || opts === void 0 ? void 0 : opts.incomplete) !== null && _b !== void 0 ? _b : true, true);
@@ -104419,9 +104419,9 @@ function getCompletionItems(thisFileName_1, variant_1, text_1, position_1, opts_
  * @param completionSettings
  * @param opts
  */
-function getCompletionItemsWithParseResult(thisFileName_1, parseResult_1, cursor_1, position_1, opts_1) {
-    return __awaiter(this, arguments, void 0, function* (thisFileName, parseResult, cursor, position, opts, completionSettings = null) {
-        var _a, _b;
+function getCompletionItemsWithParseResult(thisFileName, parseResult, cursor, position, opts, completionSettings = null) {
+    var _a, _b;
+    return __awaiter(this, void 0, void 0, function* () {
         const emptyCompletionList = createEmptyCompletionList();
         if (cursor == null) {
             return emptyCompletionList;
@@ -104468,9 +104468,9 @@ function getCompletionItemsWithParseResult(thisFileName_1, parseResult_1, cursor
  * @param settings
  * @param caos2Comments
  */
-function getInitialCompletionItems(thisFileName_1, variant_1, commands_1, positionData_1, options_1) {
-    return __awaiter(this, arguments, void 0, function* (thisFileName, variant, commands, positionData, options, settings = null, caos2Comments = []) {
-        var _a;
+function getInitialCompletionItems(thisFileName, variant, commands, positionData, options, settings = null, caos2Comments = []) {
+    var _a;
+    return __awaiter(this, void 0, void 0, function* () {
         if (positionData.previousTokens.length === 0 && ((_a = positionData.beforeText) !== null && _a !== void 0 ? _a : "").trim().length === 0) {
             return [];
         }
@@ -104594,10 +104594,10 @@ function getInitialCompletionItemsSafe(thisFileName, variant, cursor, caos2Comme
 
 /***/ },
 
-/***/ "../caos-util/lib/constants.js"
-/*!*************************************!*\
-  !*** ../caos-util/lib/constants.js ***!
-  \*************************************/
+/***/ "../caos/dist/constants.js"
+/*!*********************************!*\
+  !*** ../caos/dist/constants.js ***!
+  \*********************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -104652,7 +104652,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   UNKNOWN_TYPE_ID: () => (/* binding */ UNKNOWN_TYPE_ID),
 /* harmony export */   VARIABLE_TYPE_ID: () => (/* binding */ VARIABLE_TYPE_ID)
 /* harmony export */ });
-/* harmony import */ var _token_utils_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./token-utils.js */ "../caos-util/lib/token-utils.js");
+/* harmony import */ var _token_utils_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./token-utils.js */ "../caos/dist/token-utils.js");
 // noinspection JSUnusedGlobalSymbols,SpellCheckingInspection
 
 const INT_TYPE_ID = 1;
@@ -104707,10 +104707,10 @@ const CAOS2_COMMENT_TYPE = (0,_token_utils_js__WEBPACK_IMPORTED_MODULE_0__.tok)(
 
 /***/ },
 
-/***/ "../caos-util/lib/context-walker.js"
-/*!******************************************!*\
-  !*** ../caos-util/lib/context-walker.js ***!
-  \******************************************/
+/***/ "../caos/dist/context-walker.js"
+/*!**************************************!*\
+  !*** ../caos/dist/context-walker.js ***!
+  \**************************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -104719,8 +104719,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   CaosContextListenerBase: () => (/* binding */ CaosContextListenerBase),
 /* harmony export */   walkCaosParseResult: () => (/* binding */ walkCaosParseResult)
 /* harmony export */ });
-/* harmony import */ var _constants_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./constants.js */ "../caos-util/lib/constants.js");
-/* harmony import */ var _token_utils_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./token-utils.js */ "../caos-util/lib/token-utils.js");
+/* harmony import */ var _constants_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./constants.js */ "../caos/dist/constants.js");
+/* harmony import */ var _token_utils_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./token-utils.js */ "../caos/dist/token-utils.js");
 // noinspection JSUnusedGlobalSymbols
 
 
@@ -104851,19 +104851,32 @@ class CaosContextListenerBase {
 
 /***/ },
 
-/***/ "../caos-util/lib/cursor-data.js"
-/*!***************************************!*\
-  !*** ../caos-util/lib/cursor-data.js ***!
-  \***************************************/
+/***/ "../caos/dist/cursor-data.js"
+/*!***********************************!*\
+  !*** ../caos/dist/cursor-data.js ***!
+  \***********************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   getCommandBeneathCursor: () => (/* binding */ getCommandBeneathCursor)
+/* harmony export */   CaosCursorData17w9wmbf8gpnn: () => (/* reexport safe */ _creatures_lsp_caos_kt_caos_cursor_data__WEBPACK_IMPORTED_MODULE_2__.CaosCursorData17w9wmbf8gpnn),
+/* harmony export */   cancelComplete: () => (/* reexport safe */ _creatures_lsp_caos_kt_caos_cursor_data__WEBPACK_IMPORTED_MODULE_2__.cancelComplete),
+/* harmony export */   caosCursorDataDefaultSerializerq9swop59o3bz: () => (/* reexport safe */ _creatures_lsp_caos_kt_caos_cursor_data__WEBPACK_IMPORTED_MODULE_2__.caosCursorDataDefaultSerializerq9swop59o3bz),
+/* harmony export */   caosCursorPolymorphic82bb4z4wd59t: () => (/* reexport safe */ _creatures_lsp_caos_kt_caos_cursor_data__WEBPACK_IMPORTED_MODULE_2__.caosCursorPolymorphic82bb4z4wd59t),
+/* harmony export */   getCaosCursorPosition: () => (/* reexport safe */ _creatures_lsp_caos_kt_caos_cursor_data__WEBPACK_IMPORTED_MODULE_2__.getCaosCursorPosition),
+/* harmony export */   getCaosCursorPositionFromRawText: () => (/* reexport safe */ _creatures_lsp_caos_kt_caos_cursor_data__WEBPACK_IMPORTED_MODULE_2__.getCaosCursorPositionFromRawText),
+/* harmony export */   getClosestCaosItem: () => (/* reexport safe */ _creatures_lsp_caos_kt_caos_cursor_data__WEBPACK_IMPORTED_MODULE_2__.getClosestCaosItem),
+/* harmony export */   getCommandBeneathCursor: () => (/* binding */ getCommandBeneathCursor),
+/* harmony export */   getCursorPosition266q2iy9t93vs: () => (/* reexport safe */ _creatures_lsp_caos_kt_caos_cursor_data__WEBPACK_IMPORTED_MODULE_2__.getCursorPosition266q2iy9t93vs),
+/* harmony export */   inQuotes: () => (/* reexport safe */ _creatures_lsp_caos_kt_caos_cursor_data__WEBPACK_IMPORTED_MODULE_2__.inQuotes),
+/* harmony export */   inQuotesxajls60gyssd: () => (/* reexport safe */ _creatures_lsp_caos_kt_caos_cursor_data__WEBPACK_IMPORTED_MODULE_2__.inQuotesxajls60gyssd),
+/* harmony export */   shouldCancelCompletejkntipieiidk: () => (/* reexport safe */ _creatures_lsp_caos_kt_caos_cursor_data__WEBPACK_IMPORTED_MODULE_2__.shouldCancelCompletejkntipieiidk)
 /* harmony export */ });
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/position-utils.js");
-/* harmony import */ var _is_util_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./is-util.js */ "../caos-util/lib/is-util.js");
+/* harmony import */ var _is_util_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./is-util.js */ "../caos/dist/is-util.js");
+/* harmony import */ var _creatures_lsp_caos_kt_caos_cursor_data__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @creatures-lsp/caos-kt/caos-cursor-data */ "../caos-kt/dist/caos-cursor-data.mjs");
+
 
 
 function flattenCommands(call) {
@@ -104907,10 +104920,10 @@ function getCommandBeneathCursor(variant, commandCalls, position, inTokenOnly) {
 
 /***/ },
 
-/***/ "../caos-util/lib/document-symbols-provider.js"
-/*!*****************************************************!*\
-  !*** ../caos-util/lib/document-symbols-provider.js ***!
-  \*****************************************************/
+/***/ "../caos/dist/document-symbols.js"
+/*!****************************************!*\
+  !*** ../caos/dist/document-symbols.js ***!
+  \****************************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -104922,7 +104935,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _creatures_lsp_caos_kt_caos_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos-kt/caos-core */ "../caos-kt/dist/caos-core.mjs");
 /* harmony import */ var _creatures_lsp_caos_kt_caos_parser__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/caos-kt/caos-parser */ "../caos-kt/dist/caos-parser.mjs");
 /* harmony import */ var vscode_languageserver_types__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! vscode-languageserver-types */ "../../node_modules/vscode-languageserver-types/lib/esm/main.js");
-/* harmony import */ var _subroutines_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./subroutines.js */ "../caos-util/lib/subroutines.js");
+/* harmony import */ var _subroutines_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./subroutines.js */ "../caos/dist/subroutines.js");
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/position-utils.js");
 // noinspection JSUnusedGlobalSymbols
 
@@ -105045,10 +105058,10 @@ function getEventScriptName(script) {
 
 /***/ },
 
-/***/ "../caos-util/lib/documentation-formattter.js"
-/*!****************************************************!*\
-  !*** ../caos-util/lib/documentation-formattter.js ***!
-  \****************************************************/
+/***/ "../caos/dist/documentation-formattter.js"
+/*!************************************************!*\
+  !*** ../caos/dist/documentation-formattter.js ***!
+  \************************************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -105117,10 +105130,10 @@ function formatCommandStringAsMarkdown(command, string) {
 
 /***/ },
 
-/***/ "../caos-util/lib/drillDown.js"
-/*!*************************************!*\
-  !*** ../caos-util/lib/drillDown.js ***!
-  \*************************************/
+/***/ "../caos/dist/drillDown.js"
+/*!*********************************!*\
+  !*** ../caos/dist/drillDown.js ***!
+  \*********************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -105129,7 +105142,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   drillDown: () => (/* binding */ drillDown)
 /* harmony export */ });
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/lsp-runner.js");
-/* harmony import */ var _is_util_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./is-util.js */ "../caos-util/lib/is-util.js");
+/* harmony import */ var _is_util_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./is-util.js */ "../caos/dist/is-util.js");
 
 
 /**
@@ -105192,10 +105205,10 @@ function inRange(range, position) {
 
 /***/ },
 
-/***/ "../caos-util/lib/formatter.js"
-/*!*************************************!*\
-  !*** ../caos-util/lib/formatter.js ***!
-  \*************************************/
+/***/ "../caos/dist/formatter.js"
+/*!*********************************!*\
+  !*** ../caos/dist/formatter.js ***!
+  \*********************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -105246,10 +105259,10 @@ function format(variant, text, settings, showMessage) {
 
 /***/ },
 
-/***/ "../caos-util/lib/goto.js"
-/*!********************************!*\
-  !*** ../caos-util/lib/goto.js ***!
-  \********************************/
+/***/ "../caos/dist/goto.js"
+/*!****************************!*\
+  !*** ../caos/dist/goto.js ***!
+  \****************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -105263,7 +105276,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/position-utils.js");
 /* harmony import */ var _creatures_lsp_caos_kt_caos_parser__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/caos-kt/caos-parser */ "../caos-kt/dist/caos-parser.mjs");
 /* harmony import */ var _creatures_lsp_caos_kt_caos_cursor_data__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @creatures-lsp/caos-kt/caos-cursor-data */ "../caos-kt/dist/caos-cursor-data.mjs");
-/* harmony import */ var _is_util_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./is-util.js */ "../caos-util/lib/is-util.js");
+/* harmony import */ var _is_util_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./is-util.js */ "../caos/dist/is-util.js");
 
 
 
@@ -105399,10 +105412,10 @@ function isInCaosCatalogueKey(commandCall, closestItem) {
 
 /***/ },
 
-/***/ "../caos-util/lib/hover-documentation.js"
-/*!***********************************************!*\
-  !*** ../caos-util/lib/hover-documentation.js ***!
-  \***********************************************/
+/***/ "../caos/dist/hover-documentation.js"
+/*!*******************************************!*\
+  !*** ../caos/dist/hover-documentation.js ***!
+  \*******************************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -105411,9 +105424,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   getHoverItem: () => (/* binding */ getHoverItem)
 /* harmony export */ });
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/position-utils.js");
-/* harmony import */ var _documentation_formattter_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./documentation-formattter.js */ "../caos-util/lib/documentation-formattter.js");
+/* harmony import */ var _documentation_formattter_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./documentation-formattter.js */ "../caos/dist/documentation-formattter.js");
 /* harmony import */ var _creatures_lsp_caos_kt_caos_cursor_data__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @creatures-lsp/caos-kt/caos-cursor-data */ "../caos-kt/dist/caos-cursor-data.mjs");
-/* harmony import */ var _is_util_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./is-util.js */ "../caos-util/lib/is-util.js");
+/* harmony import */ var _is_util_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./is-util.js */ "../caos/dist/is-util.js");
 /* eslint-disable eqeqeq */
 // noinspection JSUnusedGlobalSymbols
 
@@ -105482,21 +105495,24 @@ function getHoverItem(variant, text, position) {
 
 /***/ },
 
-/***/ "../caos-util/lib/inlay-hints.js"
-/*!***************************************!*\
-  !*** ../caos-util/lib/inlay-hints.js ***!
-  \***************************************/
+/***/ "../caos/dist/inlay-hints.js"
+/*!***********************************!*\
+  !*** ../caos/dist/inlay-hints.js ***!
+  \***********************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   getCaosDocumentInlayHints: () => (/* binding */ getCaosDocumentInlayHints)
+/* harmony export */   getCaosInlayHints: () => (/* reexport safe */ _creatures_lsp_caos_kt_caos_inlay_hints__WEBPACK_IMPORTED_MODULE_1__.getCaosInlayHints),
+/* harmony export */   getCaosInlayHintsWithOffset: () => (/* binding */ getCaosInlayHintsWithOffset),
+/* harmony export */   getCaosInlayOptions: () => (/* reexport safe */ _creatures_lsp_caos_kt_caos_inlay_hints__WEBPACK_IMPORTED_MODULE_1__.getCaosInlayOptions)
 /* harmony export */ });
 /* harmony import */ var _creatures_lsp_caos_kt_caos_parser__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos-kt/caos-parser */ "../caos-kt/dist/caos-parser.mjs");
 /* harmony import */ var _creatures_lsp_caos_kt_caos_inlay_hints__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/caos-kt/caos-inlay-hints */ "../caos-kt/dist/caos-inlay-hints.mjs");
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/lsp-runner.js");
-/* harmony import */ var _is_util_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./is-util.js */ "../caos-util/lib/is-util.js");
+/* harmony import */ var _is_util_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./is-util.js */ "../caos/dist/is-util.js");
+
 
 
 
@@ -105507,15 +105523,15 @@ __webpack_require__.r(__webpack_exports__);
  * @param text text or parse result of CAOS document
  * @param disabledInlayHints list of ids for inlay hint providers that should be disabled
  * @param minimumParametersForInlayHints
+ * @param offset
  */
-function getCaosDocumentInlayHints(variant, text, disabledInlayHints, minimumParametersForInlayHints = null) {
+function getCaosInlayHintsWithOffset(variant, text, disabledInlayHints, minimumParametersForInlayHints = null, offset = (0,_creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_2__.isVsCode)() ? 1 : 0) {
     const parseResult = typeof text === 'string'
         ? (0,_creatures_lsp_caos_kt_caos_parser__WEBPACK_IMPORTED_MODULE_0__.parseCaos)(variant, text)
         : (_is_util_js__WEBPACK_IMPORTED_MODULE_3__.Is.parseResult(text) ? text : null);
     if (parseResult == null) {
         return [];
     }
-    const offset = (0,_creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_2__.isVsCode)() ? 1 : 0;
     const hints = (0,_creatures_lsp_caos_kt_caos_inlay_hints__WEBPACK_IMPORTED_MODULE_1__.getCaosInlayHints)(parseResult, disabledInlayHints !== null && disabledInlayHints !== void 0 ? disabledInlayHints : [], [], minimumParametersForInlayHints);
     if (offset === 0) {
         return hints;
@@ -105531,10 +105547,10 @@ function getCaosDocumentInlayHints(variant, text, disabledInlayHints, minimumPar
 
 /***/ },
 
-/***/ "../caos-util/lib/is-similar-variant.js"
-/*!**********************************************!*\
-  !*** ../caos-util/lib/is-similar-variant.js ***!
-  \**********************************************/
+/***/ "../caos/dist/is-similar-variant.js"
+/*!******************************************!*\
+  !*** ../caos/dist/is-similar-variant.js ***!
+  \******************************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -105569,10 +105585,10 @@ function isC3DSVariant(variant) {
 
 /***/ },
 
-/***/ "../caos-util/lib/is-similar.js"
-/*!**************************************!*\
-  !*** ../caos-util/lib/is-similar.js ***!
-  \**************************************/
+/***/ "../caos/dist/is-similar.js"
+/*!**********************************!*\
+  !*** ../caos/dist/is-similar.js ***!
+  \**********************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -105580,7 +105596,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   isSimilarType: () => (/* binding */ isSimilarType)
 /* harmony export */ });
-/* harmony import */ var _constants_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./constants.js */ "../caos-util/lib/constants.js");
+/* harmony import */ var _constants_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./constants.js */ "../caos/dist/constants.js");
 // noinspection JSUnusedGlobalSymbols
 
 const anyTypes = [
@@ -105662,10 +105678,10 @@ function isSimilarType(aType, other) {
 
 /***/ },
 
-/***/ "../caos-util/lib/is-util.js"
-/*!***********************************!*\
-  !*** ../caos-util/lib/is-util.js ***!
-  \***********************************/
+/***/ "../caos/dist/is-util.js"
+/*!*******************************!*\
+  !*** ../caos/dist/is-util.js ***!
+  \*******************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -105678,7 +105694,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   isSimilarVariant: () => (/* reexport safe */ _is_similar_variant_js__WEBPACK_IMPORTED_MODULE_1__.isSimilarVariant)
 /* harmony export */ });
 /* harmony import */ var _creatures_lsp_caos_kt_caos_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos-kt/caos-core */ "../caos-kt/dist/caos-core.mjs");
-/* harmony import */ var _is_similar_variant_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./is-similar-variant.js */ "../caos-util/lib/is-similar-variant.js");
+/* harmony import */ var _is_similar_variant_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./is-similar-variant.js */ "../caos/dist/is-similar-variant.js");
 
 /**
  * Checks if variable is of a given type
@@ -105740,10 +105756,10 @@ var Is;
 
 /***/ },
 
-/***/ "../caos-util/lib/semantic-highlighter.js"
-/*!************************************************!*\
-  !*** ../caos-util/lib/semantic-highlighter.js ***!
-  \************************************************/
+/***/ "../caos/dist/semantic-highlighter.js"
+/*!********************************************!*\
+  !*** ../caos/dist/semantic-highlighter.js ***!
+  \********************************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -105755,16 +105771,16 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   getCaosSemanticTokens: () => (/* binding */ getCaosSemanticTokens),
 /* harmony export */   getSemanticTokensLegend: () => (/* binding */ getSemanticTokensLegend)
 /* harmony export */ });
-/* harmony import */ var _documentation_formattter_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./documentation-formattter.js */ "../caos-util/lib/documentation-formattter.js");
-/* harmony import */ var _semantics_legend_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./semantics-legend.js */ "../caos-util/lib/semantics-legend.js");
+/* harmony import */ var _documentation_formattter_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./documentation-formattter.js */ "../caos/dist/documentation-formattter.js");
+/* harmony import */ var _semantics_legend_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./semantics-legend.js */ "../caos/dist/semantics-legend.js");
 /* harmony import */ var _creatures_lsp_caos_kt_caos_parser__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @creatures-lsp/caos-kt/caos-parser */ "../caos-kt/dist/caos-parser.mjs");
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/position-utils.js");
-/* harmony import */ var _constants_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./constants.js */ "../caos-util/lib/constants.js");
-/* harmony import */ var _token_utils_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./token-utils.js */ "../caos-util/lib/token-utils.js");
-/* harmony import */ var _commands_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./commands.js */ "../caos-util/lib/commands.js");
-/* harmony import */ var _context_walker_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./context-walker.js */ "../caos-util/lib/context-walker.js");
-/* harmony import */ var _caos2_caos2pray_definitions_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./caos2/caos2pray-definitions.js */ "../caos-util/lib/caos2/caos2pray-definitions.js");
-/* harmony import */ var _is_util_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./is-util.js */ "../caos-util/lib/is-util.js");
+/* harmony import */ var _constants_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./constants.js */ "../caos/dist/constants.js");
+/* harmony import */ var _token_utils_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./token-utils.js */ "../caos/dist/token-utils.js");
+/* harmony import */ var _commands_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./commands.js */ "../caos/dist/commands.js");
+/* harmony import */ var _context_walker_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./context-walker.js */ "../caos/dist/context-walker.js");
+/* harmony import */ var _caos2_caos2pray_definitions_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./caos2/caos2pray-definitions.js */ "../caos/dist/caos2/caos2pray-definitions.js");
+/* harmony import */ var _is_util_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./is-util.js */ "../caos/dist/is-util.js");
 // noinspection JSUnusedGlobalSymbols
 
 
@@ -106380,10 +106396,10 @@ function getSemanticTokensLegend() {
 
 /***/ },
 
-/***/ "../caos-util/lib/semantics-legend.js"
-/*!********************************************!*\
-  !*** ../caos-util/lib/semantics-legend.js ***!
-  \********************************************/
+/***/ "../caos/dist/semantics-legend.js"
+/*!****************************************!*\
+  !*** ../caos/dist/semantics-legend.js ***!
+  \****************************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -106487,10 +106503,10 @@ const SemanticTokensMap = {
 
 /***/ },
 
-/***/ "../caos-util/lib/subroutines.js"
-/*!***************************************!*\
-  !*** ../caos-util/lib/subroutines.js ***!
-  \***************************************/
+/***/ "../caos/dist/subroutines.js"
+/*!***********************************!*\
+  !*** ../caos/dist/subroutines.js ***!
+  \***********************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -106500,9 +106516,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   getSubroutines: () => (/* binding */ getSubroutines),
 /* harmony export */   hasSubroutine: () => (/* binding */ hasSubroutine)
 /* harmony export */ });
-/* harmony import */ var _constants_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./constants.js */ "../caos-util/lib/constants.js");
+/* harmony import */ var _constants_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./constants.js */ "../caos/dist/constants.js");
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/position-utils.js");
-/* harmony import */ var _token_utils_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./token-utils.js */ "../caos-util/lib/token-utils.js");
+/* harmony import */ var _token_utils_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./token-utils.js */ "../caos/dist/token-utils.js");
 /* eslint-disable eqeqeq */
 // noinspection JSUnusedGlobalSymbols
 
@@ -106563,10 +106579,10 @@ function getSubroutines(items, afterToken = SUBR) {
 
 /***/ },
 
-/***/ "../caos-util/lib/token-utils.js"
-/*!***************************************!*\
-  !*** ../caos-util/lib/token-utils.js ***!
-  \***************************************/
+/***/ "../caos/dist/token-utils.js"
+/*!***********************************!*\
+  !*** ../caos/dist/token-utils.js ***!
+  \***********************************/
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -106575,7 +106591,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   singleTokenOrNull: () => (/* binding */ singleTokenOrNull),
 /* harmony export */   tok: () => (/* binding */ tok)
 /* harmony export */ });
-/* harmony import */ var _is_util_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./is-util.js */ "../caos-util/lib/is-util.js");
+/* harmony import */ var _is_util_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./is-util.js */ "../caos/dist/is-util.js");
 
 function tok(token) {
     if (typeof token === 'number') {
@@ -106607,52 +106623,6 @@ const singleTokenOrNull = (tokens) => {
 };
 
 
-/***/ },
-
-/***/ "../catalogue/dist/catalogue.range.js"
-/*!********************************************!*\
-  !*** ../catalogue/dist/catalogue.range.js ***!
-  \********************************************/
-(__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   getCatalogueRange: () => (/* binding */ getCatalogueRange)
-/* harmony export */ });
-function getCatalogueRange(entry) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
-    const start = entry.keywordParserItem.textRange.start;
-    const entries = ((_a = entry.valueParserItems) !== null && _a !== void 0 ? _a : [])
-        .concat(...((_b = entry.looseItems) !== null && _b !== void 0 ? _b : []))
-        .concat(...((_c = entry.errorHeaderItems) !== null && _c !== void 0 ? _c : []))
-        .concat((_f = (_e = (_d = entry.arrayCountParserItem) !== null && _d !== void 0 ? _d : entry.catalogueNameParserItem) !== null && _e !== void 0 ? _e : entry.overrideKeyword) !== null && _f !== void 0 ? _f : entry.keywordParserItem);
-    entries.sort(sortParserItemsByStart);
-    let end = (_h = (_g = entries.pop()) === null || _g === void 0 ? void 0 : _g.textRange) === null || _h === void 0 ? void 0 : _h.end;
-    if (end == null) {
-        return entry.keywordParserItem.textRange;
-    }
-    else {
-        return {
-            start: start,
-            end: end
-        };
-    }
-}
-function sortParserItemsByStart(a, b) {
-    const first = sortValue(a.textRange);
-    const second = sortValue(b.textRange);
-    const difference = first - second;
-    if (difference === 0) {
-        return 0;
-    }
-    return difference > 0 ? 1 : -1;
-}
-function sortValue(range) {
-    return (range.start.line << 16) | range.start.character;
-}
-
-
 /***/ },
 
 /***/ "../catalogue/dist/completion/completions.agent-help.js"
@@ -107087,6 +107057,52 @@ var IsCatalogue;
 })(IsCatalogue || (IsCatalogue = {}));
 
 
+/***/ },
+
+/***/ "../catalogue/dist/range.js"
+/*!**********************************!*\
+  !*** ../catalogue/dist/range.js ***!
+  \**********************************/
+(__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   getCatalogueRange: () => (/* binding */ getCatalogueRange)
+/* harmony export */ });
+function getCatalogueRange(entry) {
+    var _a, _b, _c, _d, _e, _f, _g, _h;
+    const start = entry.keywordParserItem.textRange.start;
+    const entries = ((_a = entry.valueParserItems) !== null && _a !== void 0 ? _a : [])
+        .concat(...((_b = entry.looseItems) !== null && _b !== void 0 ? _b : []))
+        .concat(...((_c = entry.errorHeaderItems) !== null && _c !== void 0 ? _c : []))
+        .concat((_f = (_e = (_d = entry.arrayCountParserItem) !== null && _d !== void 0 ? _d : entry.catalogueNameParserItem) !== null && _e !== void 0 ? _e : entry.overrideKeyword) !== null && _f !== void 0 ? _f : entry.keywordParserItem);
+    entries.sort(sortParserItemsByStart);
+    let end = (_h = (_g = entries.pop()) === null || _g === void 0 ? void 0 : _g.textRange) === null || _h === void 0 ? void 0 : _h.end;
+    if (end == null) {
+        return entry.keywordParserItem.textRange;
+    }
+    else {
+        return {
+            start: start,
+            end: end
+        };
+    }
+}
+function sortParserItemsByStart(a, b) {
+    const first = sortValue(a.textRange);
+    const second = sortValue(b.textRange);
+    const difference = first - second;
+    if (difference === 0) {
+        return 0;
+    }
+    return difference > 0 ? 1 : -1;
+}
+function sortValue(range) {
+    return (range.start.line << 16) | range.start.character;
+}
+
+
 /***/ },
 
 /***/ "../extension-util/dist/LanguageDocumentData.js"
@@ -108499,7 +108515,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   caosInitLib: () => (/* binding */ caosInitLib)
 /* harmony export */ });
-/* harmony import */ var _creatures_lsp_caos_kt_caos_libsfile_full__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos-kt/caos-libsfile-full */ "../caos-kt/dist/caos-libsfile-full.mjs");
+/* harmony import */ var _creatures_lsp_caos_libsfile_full__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos/libsfile-full */ "../caos-kt/dist/caos-libsfile-full.mjs");
 
 let didInit = false;
 const caosInitLib = () => {
@@ -108507,7 +108523,7 @@ const caosInitLib = () => {
         return;
     }
     didInit = true;
-    (0,_creatures_lsp_caos_kt_caos_libsfile_full__WEBPACK_IMPORTED_MODULE_0__.useFullCaosLibDefinitions)();
+    (0,_creatures_lsp_caos_libsfile_full__WEBPACK_IMPORTED_MODULE_0__.useFullCaosLibDefinitions)();
 };
 
 
@@ -108525,9 +108541,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   registerCaosCodeActions: () => (/* binding */ registerCaosCodeActions)
 /* harmony export */ });
 /* harmony import */ var _connection_vscode_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../connection.vscode.js */ "./src/connection.vscode.ts");
-/* harmony import */ var _creatures_lsp_caos_kt_caos_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/caos-kt/caos-core */ "../caos-kt/dist/caos-core.mjs");
+/* harmony import */ var _creatures_lsp_caos_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/caos/core */ "../caos-kt/dist/caos-core.mjs");
 /* harmony import */ var _documents_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../documents.js */ "./src/documents.ts");
-/* harmony import */ var _creatures_lsp_caos_kt_caos_parser__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @creatures-lsp/caos-kt/caos-parser */ "../caos-kt/dist/caos-parser.mjs");
+/* harmony import */ var _creatures_lsp_caos_parser__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @creatures-lsp/caos/parser */ "../caos-kt/dist/caos-parser.mjs");
 /* harmony import */ var _settings_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./settings.js */ "./src/caos/settings.ts");
 /* harmony import */ var vscode_languageserver__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! vscode-languageserver */ "../../node_modules/vscode-languageserver/lib/node/main.js");
 /* harmony import */ var vscode_languageserver__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(vscode_languageserver__WEBPACK_IMPORTED_MODULE_5__);
@@ -108550,7 +108566,7 @@ var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _argume
 
 
 
-const errorTypes = _creatures_lsp_caos_kt_caos_core__WEBPACK_IMPORTED_MODULE_1__.ErrorTypes.getInstance();
+const errorTypes = _creatures_lsp_caos_core__WEBPACK_IMPORTED_MODULE_1__.ErrorTypes.getInstance();
 function registerCaosCodeActions(register) {
     if (register) {
         _connection_vscode_js__WEBPACK_IMPORTED_MODULE_0__.connection.onCodeAction(codeActionHandler);
@@ -108691,7 +108707,7 @@ const createParseResultAsyncGetter = (getVariantAsync, getDocumentAsync, positio
         if (text == null) {
             return null;
         }
-        return (0,_creatures_lsp_caos_kt_caos_parser__WEBPACK_IMPORTED_MODULE_3__.parseCaosNear)(variant, text, position.line, position.character);
+        return (0,_creatures_lsp_caos_parser__WEBPACK_IMPORTED_MODULE_3__.parseCaosNear)(variant, text, position.line, position.character);
     }));
 };
 const createCacheablePromise = (create) => {
@@ -108727,15 +108743,15 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   getCommandCallPositionalDataFromDocument: () => (/* binding */ getCommandCallPositionalDataFromDocument)
 /* harmony export */ });
-/* harmony import */ var _creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos-util */ "../caos-util/lib/command-call-positional-data.js");
-/* harmony import */ var _creatures_lsp_caos_kt_caos_parser__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/caos-kt/caos-parser */ "../caos-kt/dist/caos-parser.mjs");
+/* harmony import */ var _creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos */ "../caos/dist/command-call-positional-data.js");
+/* harmony import */ var _creatures_lsp_caos_parser__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/caos/parser */ "../caos-kt/dist/caos-parser.mjs");
 
 
 function getCommandCallPositionalDataFromDocument(document, position) {
     const { text, variant } = document;
     const { line, character } = position;
-    const parseResult = (0,_creatures_lsp_caos_kt_caos_parser__WEBPACK_IMPORTED_MODULE_1__.parseCaosNear)(variant, text, line, character, false);
-    return (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_0__.getCommandCallPositionalDataFromParseResult)(parseResult, position);
+    const parseResult = (0,_creatures_lsp_caos_parser__WEBPACK_IMPORTED_MODULE_1__.parseCaosNear)(variant, text, line, character, false);
+    return (0,_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_0__.getCommandCallPositionalDataFromParseResult)(parseResult, position);
 }
 
 
@@ -108753,10 +108769,10 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   getCaosCompletionItemsForDocument: () => (/* binding */ getCaosCompletionItemsForDocument)
 /* harmony export */ });
 /* harmony import */ var _settings_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./settings.js */ "./src/caos/settings.ts");
-/* harmony import */ var _creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/caos-util */ "../caos-util/lib/completions.js");
-/* harmony import */ var _creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @creatures-lsp/caos-util */ "../caos-util/lib/completion/completion.namedVariables.js");
-/* harmony import */ var _creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @creatures-lsp/caos-util */ "../caos-util/lib/completion/completion.journal.js");
-/* harmony import */ var _creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @creatures-lsp/caos-util */ "../caos-util/lib/completion/completion.catalogue.js");
+/* harmony import */ var _creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/caos */ "../caos/dist/completions.js");
+/* harmony import */ var _creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @creatures-lsp/caos */ "../caos/dist/completion/completion.namedVariables.js");
+/* harmony import */ var _creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @creatures-lsp/caos */ "../caos/dist/completion/completion.journal.js");
+/* harmony import */ var _creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @creatures-lsp/caos */ "../caos/dist/completion/completion.catalogue.js");
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! path */ "path");
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_5__);
 /* harmony import */ var _files_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../files.js */ "./src/files.ts");
@@ -108807,7 +108823,7 @@ function getCaosCompletionItemsForDocument(documentUri, text, position) {
         // Ensure there is enough text
         if (text == null) {
             _ConnLogger_js__WEBPACK_IMPORTED_MODULE_16__.Log.e("Cannot get caos completion with null text for: " + documentUri);
-            return (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__.createEmptyCompletionList)();
+            return (0,_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_1__.createEmptyCompletionList)();
         }
         let settings = yield ((0,_settings_js__WEBPACK_IMPORTED_MODULE_0__.getCaosDocumentSettings)(documentUri)
             .catch(e => {
@@ -108844,7 +108860,7 @@ function getCaosCompletionItemsForDocument(documentUri, text, position) {
         const cursorPointer = {
             cursor: null
         };
-        const result = yield (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__.getCompletionItems)(thisFileName, variant, text, position, options, completionSettings, cursorPointer);
+        const result = yield (0,_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_1__.getCompletionItems)(thisFileName, variant, text, position, options, completionSettings, cursorPointer);
         const currentText = ((_f = (_e = cursorPointer === null || cursorPointer === void 0 ? void 0 : cursorPointer.cursor) === null || _e === void 0 ? void 0 : _e.closestItem) === null || _f === void 0 ? void 0 : _f.value) != null ? ("" + ((_h = (_g = cursorPointer === null || cursorPointer === void 0 ? void 0 : cursorPointer.cursor) === null || _g === void 0 ? void 0 : _g.closestItem) === null || _h === void 0 ? void 0 : _h.value)) : "";
         const items = (0,_creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_11__.isSublime)() ? formatForSublime(currentText, result.items) : stripInflectionSplitter(result.items);
         return {
@@ -108868,15 +108884,15 @@ function formatForSublime(text, items) {
     });
 }
 function _getStringCompletions(workspaceUri, variant, commandCall, parameterIndex, definedOnly = false) {
-    let items = (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_2__.getNamedVariableCompletionItems)(variant, commandCall, parameterIndex, (prefix) => (0,_indices_index_caos_named_variables_js__WEBPACK_IMPORTED_MODULE_12__.getNamedVariableKeysForType)(workspaceUri, prefix, definedOnly));
+    let items = (0,_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_2__.getNamedVariableCompletionItems)(variant, commandCall, parameterIndex, (prefix) => (0,_indices_index_caos_named_variables_js__WEBPACK_IMPORTED_MODULE_12__.getNamedVariableKeysForType)(workspaceUri, prefix, definedOnly));
     if (items) {
         return items;
     }
-    items = (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_3__.getJournalNameCompletions)(variant, commandCall, parameterIndex, (directoryType) => (0,_indices_index_caos_journal_files_js__WEBPACK_IMPORTED_MODULE_13__.getJournalFileNames)(workspaceUri, directoryType));
+    items = (0,_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_3__.getJournalNameCompletions)(variant, commandCall, parameterIndex, (directoryType) => (0,_indices_index_caos_journal_files_js__WEBPACK_IMPORTED_MODULE_13__.getJournalFileNames)(workspaceUri, directoryType));
     if (items) {
         return items;
     }
-    items = (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_4__.getCatalogueNameCompletions)(variant, commandCall, parameterIndex, () => (0,_indices_index_catalogue_entries_js__WEBPACK_IMPORTED_MODULE_14__.getCatalogueKeys)(workspaceUri));
+    items = (0,_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_4__.getCatalogueNameCompletions)(variant, commandCall, parameterIndex, () => (0,_indices_index_catalogue_entries_js__WEBPACK_IMPORTED_MODULE_14__.getCatalogueKeys)(workspaceUri));
     if (items) {
         return items;
     }
@@ -108897,7 +108913,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   getCaosDocumentSymbolsInDocument: () => (/* binding */ getCaosDocumentSymbolsInDocument)
 /* harmony export */ });
-/* harmony import */ var _creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos-util */ "../caos-util/lib/document-symbols-provider.js");
+/* harmony import */ var _creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos */ "../caos/dist/document-symbols.js");
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/position-utils.js");
 var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
@@ -108915,7 +108931,7 @@ function getCaosDocumentSymbolsInDocument(document) {
         const { variant, text } = document;
         let symbolsRaw;
         try {
-            symbolsRaw = (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_0__.getCaosScriptDocumentSymbols)(variant, text);
+            symbolsRaw = (0,_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_0__.getCaosScriptDocumentSymbols)(variant, text);
         }
         catch (e) {
             const error = e instanceof Error ? (e.message + "\n" + e.stack) : e;
@@ -109074,7 +109090,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   formatCaosDocument: () => (/* binding */ formatCaosDocument)
 /* harmony export */ });
-/* harmony import */ var _creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos-util */ "../caos-util/lib/formatter.js");
+/* harmony import */ var _creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos */ "../caos/dist/formatter.js");
 /* harmony import */ var _showMessage_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../showMessage.js */ "./src/showMessage.ts");
 
 
@@ -109088,7 +109104,7 @@ function formatCaosDocument(params, document) {
     const { variant, text, settings } = document;
     const formattingSettings = Object.assign(Object.assign({}, ((_a = settings.formatting) !== null && _a !== void 0 ? _a : {})), params.options);
     try {
-        return (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_0__.format)(variant, text, formattingSettings, _showMessage_js__WEBPACK_IMPORTED_MODULE_1__.showMessage);
+        return (0,_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_0__.format)(variant, text, formattingSettings, _showMessage_js__WEBPACK_IMPORTED_MODULE_1__.showMessage);
     }
     catch (e) {
         if (e instanceof Error) {
@@ -109115,7 +109131,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   getCaosHoverDocumentation: () => (/* binding */ getCaosHoverDocumentation)
 /* harmony export */ });
-/* harmony import */ var _creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos-util */ "../caos-util/lib/hover-documentation.js");
+/* harmony import */ var _creatures_lsp_caos_hover_documentation__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos/hover-documentation */ "../caos/dist/hover-documentation.js");
 var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -109149,7 +109165,7 @@ function getCaosHoverDocumentation(text, settings, position) {
         // }
         try {
             // return getHoverItem(settings.variant, position, commandCalls)
-            return (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_0__.getHoverItem)(settings.variant, text, position);
+            return (0,_creatures_lsp_caos_hover_documentation__WEBPACK_IMPORTED_MODULE_0__.getHoverItem)(settings.variant, text, position);
         }
         catch (e) {
             const error = e instanceof Error ? (e.message + "\n" + e.stack) : e;
@@ -109173,17 +109189,17 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   parseCaos: () => (/* binding */ parseCaos)
 /* harmony export */ });
-/* harmony import */ var _creatures_lsp_caos_kt_caos_parser__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos-kt/caos-parser */ "../caos-kt/dist/caos-parser.mjs");
+/* harmony import */ var _creatures_lsp_caos_parser__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos/parser */ "../caos-kt/dist/caos-parser.mjs");
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/position-utils.js");
 
 
 function parseCaos(variant, text, vsRange) {
     if (vsRange != null) {
         const { start, end } = (0,_creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_1__.offsetVsRange)(vsRange);
-        return (0,_creatures_lsp_caos_kt_caos_parser__WEBPACK_IMPORTED_MODULE_0__.parseCaosWithin)(variant, text, start.line, start.character, end.line, end.character);
+        return (0,_creatures_lsp_caos_parser__WEBPACK_IMPORTED_MODULE_0__.parseCaosWithin)(variant, text, start.line, start.character, end.line, end.character);
     }
     else {
-        return (0,_creatures_lsp_caos_kt_caos_parser__WEBPACK_IMPORTED_MODULE_0__.parseCaos)(variant, text);
+        return (0,_creatures_lsp_caos_parser__WEBPACK_IMPORTED_MODULE_0__.parseCaos)(variant, text);
     }
 }
 
@@ -109202,15 +109218,15 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   getRawCaosLocations: () => (/* binding */ getRawCaosLocations)
 /* harmony export */ });
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/position-utils.js");
-/* harmony import */ var _creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/caos-util */ "../caos-util/lib/is-util.js");
-/* harmony import */ var _creatures_lsp_caos_kt_caos_parser__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @creatures-lsp/caos-kt/caos-parser */ "../caos-kt/dist/caos-parser.mjs");
+/* harmony import */ var _creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/caos */ "../caos/dist/is-util.js");
+/* harmony import */ var _creatures_lsp_caos_parser__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @creatures-lsp/caos/parser */ "../caos-kt/dist/caos-parser.mjs");
 /* harmony import */ var _references_references_journal_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./references/references.journal.js */ "./src/caos/references/references.journal.ts");
 /* harmony import */ var _references_references_named_variable_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./references/references.named-variable.js */ "./src/caos/references/references.named-variable.ts");
 /* harmony import */ var _references_references_util_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./references/references.util.js */ "./src/caos/references/references.util.ts");
 /* harmony import */ var _references_references_catalogue_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./references/references.catalogue.js */ "./src/caos/references/references.catalogue.ts");
 /* harmony import */ var _document_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../document.js */ "./src/document.ts");
 /* harmony import */ var _caos_init_lib_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./caos-init-lib.js */ "./src/caos/caos-init-lib.ts");
-/* harmony import */ var _creatures_lsp_caos_kt_caos_cursor_data__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! @creatures-lsp/caos-kt/caos-cursor-data */ "../caos-kt/dist/caos-cursor-data.mjs");
+/* harmony import */ var _creatures_lsp_caos_cursor_data__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! @creatures-lsp/caos/cursor-data */ "../caos-kt/dist/caos-cursor-data.mjs");
 /* harmony import */ var _ConnLogger_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../ConnLogger.js */ "./src/ConnLogger.ts");
 // noinspection ES6MissingAwait
 var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
@@ -109353,8 +109369,8 @@ function getRawCaosLocations(params, workspaceUri, document) {
         //
         //
         // const commandStringUpper: string = commandCall.commandString.toUpperCase();
-        const parseResult = (0,_creatures_lsp_caos_kt_caos_parser__WEBPACK_IMPORTED_MODULE_2__.parseCaosNear)(variant, text, line, character, false);
-        const cursorData = (0,_creatures_lsp_caos_kt_caos_cursor_data__WEBPACK_IMPORTED_MODULE_9__.getCaosCursorPosition)(parseResult, line, character, false);
+        const parseResult = (0,_creatures_lsp_caos_parser__WEBPACK_IMPORTED_MODULE_2__.parseCaosNear)(variant, text, line, character, false);
+        const cursorData = (0,_creatures_lsp_caos_cursor_data__WEBPACK_IMPORTED_MODULE_9__.getCaosCursorPosition)(parseResult, line, character, false);
         const command = cursorData.command;
         if (command == null) {
             console.log("Command null in reference provider");
@@ -109370,7 +109386,7 @@ function getRawCaosLocations(params, workspaceUri, document) {
             return [];
         }
         const out = [];
-        if (_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__.Is.commandToken(closestItem)) {
+        if (_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_1__.Is.commandToken(closestItem)) {
             console.log("Closest item is a command token");
             const commands = yield (0,_references_references_util_js__WEBPACK_IMPORTED_MODULE_5__.getAllCommandUsages)(workspaceUri, variant, command.command, command.isCommand, params);
             for (const file in commands) {
@@ -109402,7 +109418,7 @@ function getRawCaosLocations(params, workspaceUri, document) {
             case "EAME":
             case "NAME":
             case "MAME":
-                if (!_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__.Is.c2eStringVal(closestItem)) {
+                if (!_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_1__.Is.c2eStringVal(closestItem)) {
                     return [];
                 }
                 return (0,_references_references_named_variable_js__WEBPACK_IMPORTED_MODULE_4__.getNamedVariableReferences)(workspaceUri, commandStringUpper, closestItem.value).concat(closestItem ? {
@@ -109412,7 +109428,7 @@ function getRawCaosLocations(params, workspaceUri, document) {
             case "READ":
             case "REAN":
             case "REAQ":
-                if (!_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__.Is.c2eStringVal(closestItem)) {
+                if (!_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_1__.Is.c2eStringVal(closestItem)) {
                     _ConnLogger_js__WEBPACK_IMPORTED_MODULE_10__.Log.i(`${command.command} parameter is not C2e string. Was: ${JSON.stringify(closestItem, null, 2)}`);
                     return [];
                 }
@@ -109442,10 +109458,10 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   getCaosDocumentValidationErrors: () => (/* binding */ getCaosDocumentValidationErrors)
 /* harmony export */ });
-/* harmony import */ var _creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos-util */ "../caos-util/lib/constants.js");
-/* harmony import */ var _creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/caos-util */ "../caos-util/lib/subroutines.js");
-/* harmony import */ var _creatures_lsp_caos_kt_caos_parser__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @creatures-lsp/caos-kt/caos-parser */ "../caos-kt/dist/caos-parser.mjs");
-/* harmony import */ var _creatures_lsp_caos_kt_caos_validation__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @creatures-lsp/caos-kt/caos-validation */ "../caos-kt/dist/caos-validation.mjs");
+/* harmony import */ var _creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos */ "../caos/dist/constants.js");
+/* harmony import */ var _creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/caos */ "../caos/dist/subroutines.js");
+/* harmony import */ var _creatures_lsp_caos_parser__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @creatures-lsp/caos/parser */ "../caos-kt/dist/caos-parser.mjs");
+/* harmony import */ var _creatures_lsp_caos_validation__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @creatures-lsp/caos/validation */ "../caos-kt/dist/caos-validation.mjs");
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/position-utils.js");
 /* harmony import */ var vscode_languageserver_types__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! vscode-languageserver-types */ "../../node_modules/vscode-languageserver-types/lib/esm/main.js");
 /* harmony import */ var _inspections_inspections_core_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./inspections/inspections.core.js */ "./src/caos/inspections/inspections.core.ts");
@@ -109555,19 +109571,19 @@ function validateParserResult(documentURI, index, variant, text, strictSpaces, r
         const [, controllerAndIndex] = continueWhileCallback(documentURI, index);
         signal = controllerAndIndex.controller.signal;
         signal.throwIfAborted();
-        parseResult = (0,_creatures_lsp_caos_kt_caos_parser__WEBPACK_IMPORTED_MODULE_2__.parseCaosWithin)(variant, text, range.start.line, range.start.character, range.end.line, range.end.character);
+        parseResult = (0,_creatures_lsp_caos_parser__WEBPACK_IMPORTED_MODULE_2__.parseCaosWithin)(variant, text, range.start.line, range.start.character, range.end.line, range.end.character);
     }
     else {
         abortOldRequests(documentURI, Number.MAX_SAFE_INTEGER);
         const [continueCallback, controllerAndIndex] = continueWhileCallback(documentURI, index);
         signal = controllerAndIndex.controller.signal;
         signal.throwIfAborted();
-        parseResult = (0,_creatures_lsp_caos_kt_caos_parser__WEBPACK_IMPORTED_MODULE_2__.parseCaos)(variant, text, continueCallback);
+        parseResult = (0,_creatures_lsp_caos_parser__WEBPACK_IMPORTED_MODULE_2__.parseCaos)(variant, text, continueCallback);
     }
     signal.throwIfAborted();
     const errors = parseResult
         .controlStatementErrors
-        .concat(...(0,_creatures_lsp_caos_kt_caos_validation__WEBPACK_IMPORTED_MODULE_3__.validateCaos)(parseResult.variant, parseResult, () => { signal.throwIfAborted(); }));
+        .concat(...(0,_creatures_lsp_caos_validation__WEBPACK_IMPORTED_MODULE_3__.validateCaos)(parseResult.variant, parseResult, () => { signal.throwIfAborted(); }));
     let errorMarkers = errors
         .filter(e => {
         const message = e.message.toString();
@@ -109580,7 +109596,7 @@ function validateParserResult(documentURI, index, variant, text, strictSpaces, r
             range: textRange,
             message: error.message,
             code: error.errorCode,
-            severity: error.errorCode == _creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_0__.ERROR_TYPE_TYPE_ERROR ? vscode_languageserver_types__WEBPACK_IMPORTED_MODULE_5__.DiagnosticSeverity.Warning : vscode_languageserver_types__WEBPACK_IMPORTED_MODULE_5__.DiagnosticSeverity.Error
+            severity: error.errorCode == _creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_0__.ERROR_TYPE_TYPE_ERROR ? vscode_languageserver_types__WEBPACK_IMPORTED_MODULE_5__.DiagnosticSeverity.Warning : vscode_languageserver_types__WEBPACK_IMPORTED_MODULE_5__.DiagnosticSeverity.Error
         };
         return out;
     });
@@ -109592,7 +109608,7 @@ function validateParserResult(documentURI, index, variant, text, strictSpaces, r
         if (gsub.arguments.length == 1) {
             const arg = gsub.arguments[0];
             const textRange = arg.textRange;
-            if (!(0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__.hasSubroutine)(parseResult, arg.text.trim(), textRange.start.line, textRange.start.character)) {
+            if (!(0,_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_1__.hasSubroutine)(parseResult, arg.text.trim(), textRange.start.line, textRange.start.character)) {
                 errorMarkers.push({
                     range: (0,_creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_4__.offsetRange)(arg.textRange, 0, 1),
                     message: "Subroutine '" + arg.text.trim() + "' was not found in containing script",
@@ -109721,7 +109737,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   caosJectTcpC2e: () => (/* binding */ caosJectTcpC2e)
 /* harmony export */ });
-/* harmony import */ var _creatures_lsp_caos_kt_caos_parser__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos-kt/caos-parser */ "../caos-kt/dist/caos-parser.mjs");
+/* harmony import */ var _creatures_lsp_caos_parser__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos/parser */ "../caos-kt/dist/caos-parser.mjs");
 /* harmony import */ var net__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! net */ "net");
 /* harmony import */ var net__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(net__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! fs */ "fs");
@@ -109825,7 +109841,7 @@ const inject = (name, script, type, range, index, host, port) => __awaiter(void
     };
 });
 const caosJectTcpC2e = (serial, caos, bitmask, host, port) => __awaiter(void 0, void 0, void 0, function* () {
-    const scriptOffsets = (0,_creatures_lsp_caos_kt_caos_parser__WEBPACK_IMPORTED_MODULE_0__.caosScriptOffsets)(caos);
+    const scriptOffsets = (0,_creatures_lsp_caos_parser__WEBPACK_IMPORTED_MODULE_0__.caosScriptOffsets)(caos);
     const totalScripts = scriptOffsets.length;
     const removalScripts = bitmask & 1 ? scriptOffsets.filter(c => { var _a; return ((_a = c.startToken) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "rscr"; }) : [];
     const eventScripts = bitmask & 2 ? scriptOffsets.filter(c => { var _a; return ((_a = c.startToken) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "scrp"; }) : [];
@@ -109983,7 +109999,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _connection_vscode_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../../connection.vscode.js */ "./src/connection.vscode.ts");
 /* harmony import */ var _files_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../../files.js */ "./src/files.ts");
 /* harmony import */ var _ConnLogger_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../ConnLogger.js */ "./src/ConnLogger.ts");
-/* harmony import */ var _creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @creatures-lsp/caos-util */ "../caos-util/lib/is-similar-variant.js");
+/* harmony import */ var _creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @creatures-lsp/caos */ "../caos/dist/is-similar-variant.js");
 /* harmony import */ var _os_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../../os.js */ "./src/os.ts");
 /* harmony import */ var _caos_inject_c2e_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./caos.inject-c2e.js */ "./src/caos/commands/inject/caos.inject-c2e.ts");
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/path.js");
@@ -110004,7 +110020,7 @@ var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _argume
 
 
 function isCaosInjectSupportedForVariant(variant) {
-    if ((0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_3__.isC3DSVariant)(variant)) {
+    if ((0,_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_3__.isC3DSVariant)(variant)) {
         return _os_js__WEBPACK_IMPORTED_MODULE_4__.isUnix;
     }
     return false;
@@ -110023,7 +110039,7 @@ function injectC2eUnix(args) {
 }
 function injectLinux(args) {
     return __awaiter(this, void 0, void 0, function* () {
-        if ((0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_3__.isC3DSVariant)(args.variant)) {
+        if ((0,_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_3__.isC3DSVariant)(args.variant)) {
             return yield injectC2eUnix(args);
         }
         _connection_vscode_js__WEBPACK_IMPORTED_MODULE_0__.connection.window.showErrorMessage("Cannot inject non C3DS variants on Unix");
@@ -110032,7 +110048,7 @@ function injectLinux(args) {
 }
 function injectMac(args) {
     return __awaiter(this, void 0, void 0, function* () {
-        if ((0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_3__.isC3DSVariant)(args.variant)) {
+        if ((0,_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_3__.isC3DSVariant)(args.variant)) {
             return yield injectC2eUnix(args);
         }
         _connection_vscode_js__WEBPACK_IMPORTED_MODULE_0__.connection.window.showErrorMessage("Cannot inject non C3DS variants on Unix");
@@ -110176,8 +110192,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   updateRecentCommandsInDocument: () => (/* binding */ updateRecentCommandsInDocument)
 /* harmony export */ });
 /* harmony import */ var _settings_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./settings.js */ "./src/caos/settings.ts");
-/* harmony import */ var _creatures_lsp_caos_kt_caos_parser__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/caos-kt/caos-parser */ "../caos-kt/dist/caos-parser.mjs");
-/* harmony import */ var _creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @creatures-lsp/caos-util */ "../caos-util/lib/token-utils.js");
+/* harmony import */ var _creatures_lsp_caos_parser__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/caos/parser */ "../caos-kt/dist/caos-parser.mjs");
+/* harmony import */ var _creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @creatures-lsp/caos */ "../caos/dist/token-utils.js");
 /* harmony import */ var _workspace_scoped_object_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../workspace-scoped-object.js */ "./src/workspace-scoped-object.ts");
 /* harmony import */ var _workspace_folders_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../workspace-folders.js */ "./src/workspace-folders.ts");
 /* harmony import */ var _ConnLogger_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../ConnLogger.js */ "./src/ConnLogger.ts");
@@ -110225,11 +110241,11 @@ function _updateRecentCommandsInDocument(workspaceUri, documentUri, text, force
             return (0,_settings_js__WEBPACK_IMPORTED_MODULE_0__.getGlobalCaosSettings)();
         });
         const variant = (_a = settings.variant) !== null && _a !== void 0 ? _a : 'DS';
-        if (_creatures_lsp_caos_kt_caos_parser__WEBPACK_IMPORTED_MODULE_1__.parseCaos == null) {
+        if (_creatures_lsp_caos_parser__WEBPACK_IMPORTED_MODULE_1__.parseCaos == null) {
             console.error("parseCaos is null");
             return;
         }
-        const result = (0,_creatures_lsp_caos_kt_caos_parser__WEBPACK_IMPORTED_MODULE_1__.parseCaos)(variant, text);
+        const result = (0,_creatures_lsp_caos_parser__WEBPACK_IMPORTED_MODULE_1__.parseCaos)(variant, text);
         if (result == null) {
             return;
         }
@@ -110249,7 +110265,7 @@ function updateRecent(workspaceUri, documentUri, command, _args) {
         return;
     }
     const commandFirstToken = commandString === null || commandString === void 0 ? void 0 : commandString.substring(0, 4);
-    const token = (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_2__.tok)(commandFirstToken);
+    const token = (0,_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_2__.tok)(commandFirstToken);
     const recentForDocument = recent.get(workspaceUri, documentUri, []);
     const previousIndex = recentForDocument.indexOf(token);
     if (previousIndex > 0) {
@@ -110326,13 +110342,13 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   registerCaosCatalogueReferenceInspections: () => (/* binding */ registerCaosCatalogueReferenceInspections)
 /* harmony export */ });
-/* harmony import */ var _creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos-util */ "../caos-util/lib/is-util.js");
-/* harmony import */ var _creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/caos-util */ "../caos-util/lib/token-utils.js");
+/* harmony import */ var _creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos */ "../caos/dist/is-util.js");
+/* harmony import */ var _creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/caos */ "../caos/dist/token-utils.js");
 /* harmony import */ var _inspections_core_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./inspections.core.js */ "./src/caos/inspections/inspections.core.ts");
 
 
 const registerCaosCatalogueReferenceInspections = () => {
-    (0,_inspections_core_js__WEBPACK_IMPORTED_MODULE_2__.registerInspection)([(0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__.tok)("read")], caosCatalogueReadInspection);
+    (0,_inspections_core_js__WEBPACK_IMPORTED_MODULE_2__.registerInspection)([(0,_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_1__.tok)("read")], caosCatalogueReadInspection);
 };
 const caosCatalogueReadInspection = (context, commandCall, errors) => {
     if (commandCall.arguments.length < 2) {
@@ -110345,12 +110361,12 @@ const caosCatalogueReadInspection = (context, commandCall, errors) => {
      */
     const [tag, index] = commandCall.arguments
         .map((it) => it.parserItem);
-    if (!_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_0__.Is.c2eStringVal(tag) || !_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_0__.Is.intVal(index)) {
+    if (!_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_0__.Is.c2eStringVal(tag) || !_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_0__.Is.intVal(index)) {
         let errors = [];
-        if (!_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_0__.Is.c2eStringVal(tag)) {
+        if (!_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_0__.Is.c2eStringVal(tag)) {
             errors.push("Tag is not a string: <" + (tag === null || tag === void 0 ? void 0 : tag.text) + ">; Type: " + (tag === null || tag === void 0 ? void 0 : tag.typeToken));
         }
-        if (!_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_0__.Is.intVal(index)) {
+        if (!_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_0__.Is.intVal(index)) {
             errors.push("Index is not an int: <" + (index === null || index === void 0 ? void 0 : index.text) + ">; Type: " + (index === null || index === void 0 ? void 0 : index.typeToken));
         }
         console.log("Cannot check catalogue read command. Errors: " + errors.join(", "));
@@ -110387,7 +110403,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   collectCaosInspectionErrors: () => (/* binding */ collectCaosInspectionErrors),
 /* harmony export */   registerInspection: () => (/* binding */ registerInspection)
 /* harmony export */ });
-/* harmony import */ var _creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos-util */ "../caos-util/lib/token-utils.js");
+/* harmony import */ var _creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos */ "../caos/dist/token-utils.js");
 /* harmony import */ var _InspectionData_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./InspectionData.js */ "./src/caos/inspections/InspectionData.ts");
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/position-utils.js");
 /* harmony import */ var _inspections_register_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./inspections.register.js */ "./src/caos/inspections/inspections.register.ts");
@@ -110458,7 +110474,7 @@ const _runInspections = (context, commandCall, errors) => {
     if (tokens.length === 1) {
         const inspections = singleTokenInspections[tokens[0]];
         if (inspections) {
-            _ConnLogger_js__WEBPACK_IMPORTED_MODULE_4__.Log.i("Running " + inspections.length + " inspections for token " + (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_0__.tok)(tokens[0]));
+            _ConnLogger_js__WEBPACK_IMPORTED_MODULE_4__.Log.i("Running " + inspections.length + " inspections for token " + (0,_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_0__.tok)(tokens[0]));
             for (const inspection of inspections) {
                 if (inspection(context, commandCall, errors) === false) {
                     return false;
@@ -110468,7 +110484,7 @@ const _runInspections = (context, commandCall, errors) => {
     }
     else {
         const inspections = multiTokenInspections[tokens[0]];
-        const commandString = tokens.map(i => (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_0__.tok)(i)).join(" ");
+        const commandString = tokens.map(i => (0,_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_0__.tok)(i)).join(" ");
         if (inspections) {
             _ConnLogger_js__WEBPACK_IMPORTED_MODULE_4__.Log.i("Running " + inspections.length + " inspections for token " + commandString);
             for (const [check, inspection] of inspections) {
@@ -110526,7 +110542,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   getCatalogueNameReferences: () => (/* binding */ getCatalogueNameReferences)
 /* harmony export */ });
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/position-utils.js");
-/* harmony import */ var _creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/caos-util */ "../caos-util/lib/goto.js");
+/* harmony import */ var _creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/caos */ "../caos/dist/goto.js");
 /* harmony import */ var _indices_index_caos_catalogue_usages_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../indices/index.caos.catalogue-usages.js */ "./src/indices/index.caos.catalogue-usages.ts");
 /* harmony import */ var _indices_index_catalogue_entries_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../indices/index.catalogue.entries.js */ "./src/indices/index.catalogue.entries.ts");
 /* harmony import */ var _ConnLogger_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../ConnLogger.js */ "./src/ConnLogger.ts");
@@ -110550,7 +110566,7 @@ function getCaosCatalogueNameReferences(workspaceUri, commandCall, closestItem)
         if (closestItem == null) {
             return [];
         }
-        if (!(0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__.isInCaosCatalogueKey)(commandCall, closestItem)) {
+        if (!(0,_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_1__.isInCaosCatalogueKey)(commandCall, closestItem)) {
             return [];
         }
         const key = (_a = closestItem.value) !== null && _a !== void 0 ? _a : closestItem.text;
@@ -110591,7 +110607,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   getJournalFileNameReferences: () => (/* binding */ getJournalFileNameReferences)
 /* harmony export */ });
-/* harmony import */ var _creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos-util */ "../caos-util/lib/is-util.js");
+/* harmony import */ var _creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos */ "../caos/dist/is-util.js");
 /* harmony import */ var _indices_index_caos_journal_files_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../indices/index.caos.journal-files.js */ "./src/indices/index.caos.journal-files.ts");
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/position-utils.js");
 /* harmony import */ var _references_util_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./references.util.js */ "./src/caos/references/references.util.ts");
@@ -110615,7 +110631,7 @@ function getJournalFileNameReferences(workspaceUri, targetVariant, commandCall,
         }
         const commandStringUpper = commandCall.commandString.toUpperCase();
         const directoryTypeCaosParserItem = commandCall.arguments[0].parserItem;
-        if (directoryTypeCaosParserItem == null || !_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_0__.Is.intVal(directoryTypeCaosParserItem)) {
+        if (directoryTypeCaosParserItem == null || !_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_0__.Is.intVal(directoryTypeCaosParserItem)) {
             return [];
         }
         const directoryType = directoryTypeCaosParserItem.value;
@@ -110640,7 +110656,7 @@ function getJournalFileNameReferences(workspaceUri, targetVariant, commandCall,
             const journalCommandCallsForAnyType = yield (0,_references_util_js__WEBPACK_IMPORTED_MODULE_3__.collectCommandUsagesForFile)(file, targetVariant, commandStringUpper, true);
             const journalEntriesForType = journalCommandCallsForAnyType.filter(commandCall => {
                 const type = commandCall.arguments.length > 0 ? commandCall.arguments[0].parserItem : null;
-                return type != null && _creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_0__.Is.intVal(type) && type.value === directoryType;
+                return type != null && _creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_0__.Is.intVal(type) && type.value === directoryType;
             });
             out.concat((0,_references_util_js__WEBPACK_IMPORTED_MODULE_3__.formatCommandToLocation)(file, journalEntriesForType, 0));
         }
@@ -110697,9 +110713,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ });
 /* harmony import */ var vscode_languageserver__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! vscode-languageserver */ "../../node_modules/vscode-languageserver/lib/node/main.js");
 /* harmony import */ var vscode_languageserver__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(vscode_languageserver__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/caos-util */ "../caos-util/lib/is-similar-variant.js");
-/* harmony import */ var _creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @creatures-lsp/caos-util */ "../caos-util/lib/is-util.js");
-/* harmony import */ var _creatures_lsp_caos_kt_caos_parser__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @creatures-lsp/caos-kt/caos-parser */ "../caos-kt/dist/caos-parser.mjs");
+/* harmony import */ var _creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/caos */ "../caos/dist/is-similar-variant.js");
+/* harmony import */ var _creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @creatures-lsp/caos */ "../caos/dist/is-util.js");
+/* harmony import */ var _creatures_lsp_caos_parser__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @creatures-lsp/caos/parser */ "../caos-kt/dist/caos-parser.mjs");
 /* harmony import */ var _caos_init_lib_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./../caos-init-lib.js */ "./src/caos/caos-init-lib.ts");
 /* harmony import */ var _files_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../files.js */ "./src/files.ts");
 /* harmony import */ var _connection_vscode_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../connection.vscode.js */ "./src/connection.vscode.ts");
@@ -110779,12 +110795,12 @@ function collectCommandUsagesForFile(documentUri, targetVariant, commandUppercas
         }
         (0,_caos_init_lib_js__WEBPACK_IMPORTED_MODULE_4__.caosInitLib)();
         const { variant, text } = documentData;
-        if (!(0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__.isSimilarVariant)(targetVariant, variant)) {
+        if (!(0,_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_1__.isSimilarVariant)(targetVariant, variant)) {
             return [];
         }
         let parseResult;
         try {
-            parseResult = (0,_creatures_lsp_caos_kt_caos_parser__WEBPACK_IMPORTED_MODULE_3__.parseCaos)(variant, text);
+            parseResult = (0,_creatures_lsp_caos_parser__WEBPACK_IMPORTED_MODULE_3__.parseCaos)(variant, text);
         }
         catch (_a) {
             return [];
@@ -110809,7 +110825,7 @@ function collectCommandLRUsages(commandStringUpper, command, out, addSelf) {
         out.push(command);
     }
     const args = command.arguments
-        .filter((arg) => _creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_2__.Is.commandCall(arg));
+        .filter((arg) => _creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_2__.Is.commandCall(arg));
     for (const commandCall of args) {
         collectCommandLRUsages(commandStringUpper, commandCall, out, true);
     }
@@ -110849,7 +110865,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ });
 /* harmony import */ var _connection_vscode_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../connection.vscode.js */ "./src/connection.vscode.ts");
 /* harmony import */ var _client_capabilities_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../client-capabilities.js */ "./src/client-capabilities.ts");
-/* harmony import */ var _creatures_lsp_caos_kt_caos_inlay_hints__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @creatures-lsp/caos-kt/caos-inlay-hints */ "../caos-kt/dist/caos-inlay-hints.mjs");
+/* harmony import */ var _creatures_lsp_caos_inlay_hints__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @creatures-lsp/caos/inlay-hints */ "../caos-kt/dist/caos-inlay-hints.mjs");
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/hash-util.js");
 var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
@@ -110964,7 +110980,7 @@ function getCaosDocumentSettings(resource) {
     });
 }
 function getDisabledCaosInlayHints(settings) {
-    return (0,_creatures_lsp_caos_kt_caos_inlay_hints__WEBPACK_IMPORTED_MODULE_2__.getCaosInlayOptions)()
+    return (0,_creatures_lsp_caos_inlay_hints__WEBPACK_IMPORTED_MODULE_2__.getCaosInlayOptions)()
         .filter((option) => {
         var _a;
         const value = (_a = _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_3__.HashUtil.get(settings, option)) !== null && _a !== void 0 ? _a : _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_3__.HashUtil.get(settings, "caosScript." + option);
@@ -110998,8 +111014,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   getCatalogueDocumentSymbolsInDocument: () => (/* binding */ getCatalogueDocumentSymbolsInDocument)
 /* harmony export */ });
-/* harmony import */ var _creatures_lsp_caos_kt_catalogue_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos-kt/catalogue-core */ "../caos-kt/dist/catalogue-core.mjs");
-/* harmony import */ var _creatures_lsp_catalogue__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/catalogue */ "../catalogue/dist/catalogue.range.js");
+/* harmony import */ var _creatures_lsp_catalogue_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/catalogue/core */ "../caos-kt/dist/catalogue-core.mjs");
+/* harmony import */ var _creatures_lsp_catalogue__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/catalogue */ "../catalogue/dist/range.js");
 /* harmony import */ var vscode_languageserver__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! vscode-languageserver */ "../../node_modules/vscode-languageserver/lib/node/main.js");
 /* harmony import */ var vscode_languageserver__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(vscode_languageserver__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/position-utils.js");
@@ -111010,7 +111026,7 @@ __webpack_require__.r(__webpack_exports__);
 function getCatalogueDocumentSymbolsInDocument(document) {
     const text = document.text;
     try {
-        return (0,_creatures_lsp_caos_kt_catalogue_core__WEBPACK_IMPORTED_MODULE_0__.parseCatalogue)(text)
+        return (0,_creatures_lsp_catalogue_core__WEBPACK_IMPORTED_MODULE_0__.parseCatalogue)(text)
             .catalogueEntries
             .map(toVsCodeSymbol);
     }
@@ -111166,7 +111182,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   formatCatalogueDocument: () => (/* binding */ formatCatalogueDocument)
 /* harmony export */ });
 /* harmony import */ var _showMessage_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../showMessage.js */ "./src/showMessage.ts");
-/* harmony import */ var _creatures_lsp_caos_kt_catalogue_formatter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/caos-kt/catalogue-formatter */ "../caos-kt/dist/catalogue-formatter.mjs");
+/* harmony import */ var _creatures_lsp_catalogue_formatter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/catalogue/formatter */ "../caos-kt/dist/catalogue-formatter.mjs");
 
 
 /**
@@ -111204,7 +111220,7 @@ function format(text, serverFormatterSettings, showMessage) {
         removeCustomLineSpacing: null,
     };
     try {
-        const result = (0,_creatures_lsp_caos_kt_catalogue_formatter__WEBPACK_IMPORTED_MODULE_1__.formatCatalogue)(text, formattingSettings);
+        const result = (0,_creatures_lsp_catalogue_formatter__WEBPACK_IMPORTED_MODULE_1__.formatCatalogue)(text, formattingSettings);
         const lines = text.split('\n').length + 1;
         return [
             {
@@ -111253,7 +111269,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   getRawCatalogueLocations: () => (/* binding */ getRawCatalogueLocations)
 /* harmony export */ });
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/position-utils.js");
-/* harmony import */ var _creatures_lsp_caos_kt_catalogue_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/caos-kt/catalogue-core */ "../caos-kt/dist/catalogue-core.mjs");
+/* harmony import */ var _creatures_lsp_catalogue_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/catalogue/core */ "../caos-kt/dist/catalogue-core.mjs");
 /* harmony import */ var _document_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../document.js */ "./src/document.ts");
 /* harmony import */ var _caos_references_references_catalogue_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../caos/references/references.catalogue.js */ "./src/caos/references/references.catalogue.ts");
 // noinspection ES6MissingAwait
@@ -111277,7 +111293,7 @@ function getRawCatalogueLocations(params, workspaceUri, document) {
         }
         const { text } = document;
         const { line, character } = params.position;
-        const parseResult = (0,_creatures_lsp_caos_kt_catalogue_core__WEBPACK_IMPORTED_MODULE_1__.parseCatalogue)(text);
+        const parseResult = (0,_creatures_lsp_catalogue_core__WEBPACK_IMPORTED_MODULE_1__.parseCatalogue)(text);
         const tagNameElement = parseResult
             .catalogueEntries
             .map(e => e.catalogueNameParserItem)
@@ -111307,14 +111323,14 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   getCatalogueNameUnderCursor: () => (/* binding */ getCatalogueNameUnderCursor)
 /* harmony export */ });
-/* harmony import */ var _creatures_lsp_caos_kt_catalogue_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos-kt/catalogue-core */ "../caos-kt/dist/catalogue-core.mjs");
+/* harmony import */ var _creatures_lsp_catalogue_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/catalogue/core */ "../caos-kt/dist/catalogue-core.mjs");
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/position-utils.js");
 
 
 function getCatalogueNameUnderCursor(data, line, character) {
     var _a, _b;
     if (typeof data === "string") {
-        data = (0,_creatures_lsp_caos_kt_catalogue_core__WEBPACK_IMPORTED_MODULE_0__.parseCatalogue)(data);
+        data = (0,_creatures_lsp_catalogue_core__WEBPACK_IMPORTED_MODULE_0__.parseCatalogue)(data);
     }
     if (data == null) {
         console.error("Catalogue Parse result is null");
@@ -111343,7 +111359,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   getCatalogueDocumentValidationErrors: () => (/* binding */ getCatalogueDocumentValidationErrors)
 /* harmony export */ });
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/position-utils.js");
-/* harmony import */ var _creatures_lsp_caos_kt_catalogue_validation__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/caos-kt/catalogue-validation */ "../caos-kt/dist/catalogue-validation.mjs");
+/* harmony import */ var _creatures_lsp_catalogue_validation__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/catalogue/validation */ "../caos-kt/dist/catalogue-validation.mjs");
 /* harmony import */ var vscode_languageserver_types__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! vscode-languageserver-types */ "../../node_modules/vscode-languageserver-types/lib/esm/main.js");
 
 
@@ -111354,7 +111370,7 @@ function getCatalogueDocumentValidationErrors(document, _version, _range) {
         return [];
     }
     const maxNumberOfProblems = settings.maxNumberOfProblems;
-    let rawErrors = (0,_creatures_lsp_caos_kt_catalogue_validation__WEBPACK_IMPORTED_MODULE_1__.validateCatalogue)(text);
+    let rawErrors = (0,_creatures_lsp_catalogue_validation__WEBPACK_IMPORTED_MODULE_1__.validateCatalogue)(text);
     if (maxNumberOfProblems != null && rawErrors.length > maxNumberOfProblems) {
         rawErrors = rawErrors.splice(maxNumberOfProblems);
     }
@@ -111561,7 +111577,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   registerCompletionProvider: () => (/* binding */ registerCompletionProvider)
 /* harmony export */ });
 /* harmony import */ var _catalogue_settings_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./catalogue/settings.js */ "./src/catalogue/settings.ts");
-/* harmony import */ var _creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/caos-util */ "../caos-util/lib/completions.js");
+/* harmony import */ var _creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/caos */ "../caos/dist/completions.js");
 /* harmony import */ var _caos_caos_completions_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./caos/caos.completions.js */ "./src/caos/caos.completions.ts");
 /* harmony import */ var _connection_vscode_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./connection.vscode.js */ "./src/connection.vscode.ts");
 /* harmony import */ var _document_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./document.js */ "./src/document.ts");
@@ -111614,7 +111630,7 @@ function getCompletionsForDocument(params) {
         const documentUri = params.textDocument.uri;
         const document = yield (0,_document_js__WEBPACK_IMPORTED_MODULE_4__.unpackDocument)(documentUri);
         if (document == null) {
-            return (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__.createEmptyCompletionList)();
+            return (0,_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_1__.createEmptyCompletionList)();
         }
         const text = document.text;
         const position = params.position;
@@ -111625,7 +111641,7 @@ function getCompletionsForDocument(params) {
             case _catalogue_settings_js__WEBPACK_IMPORTED_MODULE_0__.CATALOGUE_LANGUAGE_ID:
                 return (0,_creatures_lsp_catalogue__WEBPACK_IMPORTED_MODULE_6__.getCatalogueCompletionItems)(text, position);
             default:
-                return (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__.createEmptyCompletionList)();
+                return (0,_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_1__.createEmptyCompletionList)();
         }
     });
 }
@@ -112412,14 +112428,14 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   indexCaosCatalogueUsagesInDocument: () => (/* binding */ indexCaosCatalogueUsagesInDocument)
 /* harmony export */ });
 /* harmony import */ var _index_utils_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.utils.js */ "./src/indices/index.utils.ts");
-/* harmony import */ var _creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/caos-util */ "../caos-util/lib/is-util.js");
-/* harmony import */ var _creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @creatures-lsp/caos-util */ "../caos-util/lib/token-utils.js");
+/* harmony import */ var _creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/caos */ "../caos/dist/is-util.js");
+/* harmony import */ var _creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @creatures-lsp/caos */ "../caos/dist/token-utils.js");
 // noinspection JSUnusedGlobalSymbols
 
 
-const READ = (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_2__.tok)("read");
-const REAQ = (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_2__.tok)("reaq");
-const REAN = (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_2__.tok)("rean");
+const READ = (0,_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_2__.tok)("read");
+const REAQ = (0,_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_2__.tok)("reaq");
+const REAN = (0,_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_2__.tok)("rean");
 class CaosCatalogueUsagesIndex {
     constructor() {
         this.keys = [];
@@ -112449,7 +112465,7 @@ class CaosCatalogueUsagesIndex {
     index(documentUri, commandCall, recursive) {
         // Command as token for "faster" compare
         const command = commandCall.commandString.toLowerCase();
-        const token = (command.length === 4) ? (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_2__.tok)(command) : null;
+        const token = (command.length === 4) ? (0,_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_2__.tok)(command) : null;
         // Index this command directly
         this._indexArgument(documentUri, commandCall, token === REAQ, recursive, true);
     }
@@ -112503,18 +112519,18 @@ class CaosCatalogueUsagesIndex {
      * @private
      */
     _indexArgument(documentUri, argument, isDefinition, recursive, isOriginalCall) {
-        if (!_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__.Is.commandCall(argument)) {
+        if (!_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_1__.Is.commandCall(argument)) {
             return true;
         }
         let changed = false;
         const args = [...argument.arguments];
-        const command = (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_2__.tok)(argument.commandString.toLowerCase());
+        const command = (0,_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_2__.tok)(argument.commandString.toLowerCase());
         if (command === READ || command === REAQ || command === REAN) {
             if (args.length > 0) {
                 const rawKey = args[0].parserItem;
                 const start = args[0].textRange.start;
                 this.clearAt(documentUri, start);
-                if (_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__.Is.c2eStringVal(rawKey)) {
+                if (_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_1__.Is.c2eStringVal(rawKey)) {
                     if (this.pushKey(rawKey.value)) {
                         changed = true;
                     }
@@ -112689,7 +112705,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   getJournalFileNames: () => (/* binding */ getJournalFileNames),
 /* harmony export */   indexJournalNamesInDocument: () => (/* binding */ indexJournalNamesInDocument)
 /* harmony export */ });
-/* harmony import */ var _creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos-util */ "../caos-util/lib/is-util.js");
+/* harmony import */ var _creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos */ "../caos/dist/is-util.js");
 /* harmony import */ var _index_utils_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.utils.js */ "./src/indices/index.utils.ts");
 
 
@@ -112764,13 +112780,13 @@ class WorkspaceJournalNames {
             return;
         }
         const directoryCaosParserItem = args[0].parserItem;
-        if (directoryCaosParserItem == null || !_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_0__.Is.intVal(directoryCaosParserItem)) {
+        if (directoryCaosParserItem == null || !_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_0__.Is.intVal(directoryCaosParserItem)) {
             return;
         }
         const directoryInt = directoryCaosParserItem.value;
         const index = this.getJournalForDirectory(directoryInt);
         const journalNameCaosParserItem = args[1].parserItem;
-        if (!_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_0__.Is.c2eStringVal(journalNameCaosParserItem)) {
+        if (!_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_0__.Is.c2eStringVal(journalNameCaosParserItem)) {
             return;
         }
         index.pushUsage(documentUri, journalNameCaosParserItem);
@@ -113032,8 +113048,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   getWorkspaceNamedVariableIndex: () => (/* binding */ getWorkspaceNamedVariableIndex),
 /* harmony export */   indexNamedVariablesInDocument: () => (/* binding */ indexNamedVariablesInDocument)
 /* harmony export */ });
-/* harmony import */ var _creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos-util */ "../caos-util/lib/is-util.js");
-/* harmony import */ var _creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/caos-util */ "../caos-util/lib/token-utils.js");
+/* harmony import */ var _creatures_lsp_caos_is_util__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos/is-util */ "../caos/dist/is-util.js");
+/* harmony import */ var _creatures_lsp_caos_token_utils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/caos/token-utils */ "../caos/dist/token-utils.js");
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/files-util.js");
 /* harmony import */ var _index_utils_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./index.utils.js */ "./src/indices/index.utils.ts");
 /* harmony import */ var _ConnLogger_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../ConnLogger.js */ "./src/ConnLogger.ts");
@@ -113042,6 +113058,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
 class NamedVariableIndex {
     constructor(command) {
         this.defined = [];
@@ -113071,7 +113088,7 @@ class NamedVariableIndex {
             return;
         }
         const command = commandCall.commandString.toLowerCase();
-        const token = command.length === 4 ? (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__.tok)(command) : null;
+        const token = command.length === 4 ? (0,_creatures_lsp_caos_token_utils__WEBPACK_IMPORTED_MODULE_1__.tok)(command) : null;
         // Is this call to variable the first in SETV, etc
         const isDefinition = token != null ? CAOS_SETTERS.indexOf(token) >= 0 : false;
         // Index this command directly
@@ -113140,7 +113157,7 @@ class NamedVariableIndex {
      * @private
      */
     _indexArgument(documentUri, argument, isDefinition, recursive, isOriginalCall) {
-        if (!_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_0__.Is.commandCall(argument)) {
+        if (!_creatures_lsp_caos_is_util__WEBPACK_IMPORTED_MODULE_0__.Is.commandCall(argument)) {
             return true;
         }
         let changed = false;
@@ -113150,7 +113167,7 @@ class NamedVariableIndex {
                 const rawKey = args[0].parserItem;
                 const start = args[0].textRange.start;
                 this.clearAt(documentUri, start);
-                if (_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_0__.Is.c2eStringVal(rawKey)) {
+                if (_creatures_lsp_caos_is_util__WEBPACK_IMPORTED_MODULE_0__.Is.c2eStringVal(rawKey)) {
                     if (this.pushKey(rawKey.value, isDefinition)) {
                         changed = true;
                     }
@@ -113370,21 +113387,21 @@ function deleteWorkspaceNamedVariableIndex(workspaceUri) {
     delete indices[workspaceUri.toLowerCase()];
 }
 const CAOS_SETTERS = [
-    (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__.tok)("setv"),
-    (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__.tok)("addv"),
-    (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__.tok)("subv"),
-    (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__.tok)("mulv"),
-    (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__.tok)("divv"),
-    (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__.tok)("rndv"),
-    (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__.tok)("modv"),
-    (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__.tok)("negv"),
-    (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__.tok)("absv"),
-    (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__.tok)("orrv"),
-    (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__.tok)("andv"),
-    (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__.tok)("notv"),
-    (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__.tok)("seta"),
-    (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__.tok)("sets"),
-    (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__.tok)("adds")
+    (0,_creatures_lsp_caos_token_utils__WEBPACK_IMPORTED_MODULE_1__.tok)("setv"),
+    (0,_creatures_lsp_caos_token_utils__WEBPACK_IMPORTED_MODULE_1__.tok)("addv"),
+    (0,_creatures_lsp_caos_token_utils__WEBPACK_IMPORTED_MODULE_1__.tok)("subv"),
+    (0,_creatures_lsp_caos_token_utils__WEBPACK_IMPORTED_MODULE_1__.tok)("mulv"),
+    (0,_creatures_lsp_caos_token_utils__WEBPACK_IMPORTED_MODULE_1__.tok)("divv"),
+    (0,_creatures_lsp_caos_token_utils__WEBPACK_IMPORTED_MODULE_1__.tok)("rndv"),
+    (0,_creatures_lsp_caos_token_utils__WEBPACK_IMPORTED_MODULE_1__.tok)("modv"),
+    (0,_creatures_lsp_caos_token_utils__WEBPACK_IMPORTED_MODULE_1__.tok)("negv"),
+    (0,_creatures_lsp_caos_token_utils__WEBPACK_IMPORTED_MODULE_1__.tok)("absv"),
+    (0,_creatures_lsp_caos_token_utils__WEBPACK_IMPORTED_MODULE_1__.tok)("orrv"),
+    (0,_creatures_lsp_caos_token_utils__WEBPACK_IMPORTED_MODULE_1__.tok)("andv"),
+    (0,_creatures_lsp_caos_token_utils__WEBPACK_IMPORTED_MODULE_1__.tok)("notv"),
+    (0,_creatures_lsp_caos_token_utils__WEBPACK_IMPORTED_MODULE_1__.tok)("seta"),
+    (0,_creatures_lsp_caos_token_utils__WEBPACK_IMPORTED_MODULE_1__.tok)("sets"),
+    (0,_creatures_lsp_caos_token_utils__WEBPACK_IMPORTED_MODULE_1__.tok)("adds")
 ];
 const formatIndexedItemLocationWithName = (location) => formatIndexedItemLocation(location, true);
 const formatIndexedItemLocationWithoutName = (location) => formatIndexedItemLocation(location, false);
@@ -113526,7 +113543,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ });
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/position-utils.js");
 /* harmony import */ var _index_utils_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.utils.js */ "./src/indices/index.utils.ts");
-/* harmony import */ var _creatures_lsp_catalogue__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @creatures-lsp/catalogue */ "../catalogue/dist/catalogue.range.js");
+/* harmony import */ var _creatures_lsp_catalogue__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @creatures-lsp/catalogue */ "../catalogue/dist/range.js");
 
 
 
@@ -113779,7 +113796,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   indexCatalogue: () => (/* binding */ indexCatalogue)
 /* harmony export */ });
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/position-utils.js");
-/* harmony import */ var _creatures_lsp_caos_kt_catalogue_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/caos-kt/catalogue-core */ "../caos-kt/dist/catalogue-core.mjs");
+/* harmony import */ var _creatures_lsp_catalogue_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/catalogue/core */ "../caos-kt/dist/catalogue-core.mjs");
 /* harmony import */ var _index_catalogue_entries_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./index.catalogue.entries.js */ "./src/indices/index.catalogue.entries.ts");
 /* harmony import */ var _workspace_folders_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../workspace-folders.js */ "./src/workspace-folders.ts");
 /* harmony import */ var _document_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../document.js */ "./src/document.ts");
@@ -113821,7 +113838,7 @@ function indexCatalogue(workspaceUri, documentOrUri, range) {
         if (range == null) {
             clearCatalogueIndicesForDocument(workspaceUri, document.documentUri, range);
         }
-        const result = (0,_creatures_lsp_caos_kt_catalogue_core__WEBPACK_IMPORTED_MODULE_1__.parseCatalogue)(text);
+        const result = (0,_creatures_lsp_catalogue_core__WEBPACK_IMPORTED_MODULE_1__.parseCatalogue)(text);
         const check = range == null ? ((_) => true) : ((r) => {
             return (0,_creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_0__.rangesIntersect)(range, (0,_creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_0__.toVsRange)(r));
         });
@@ -114378,9 +114395,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   registerGotoDefinitionsProvider: () => (/* binding */ registerGotoDefinitionsProvider)
 /* harmony export */ });
-/* harmony import */ var _creatures_lsp_caos_kt_caos_cursor_data__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos-kt/caos-cursor-data */ "../caos-kt/dist/caos-cursor-data.mjs");
-/* harmony import */ var _creatures_lsp_caos_kt_caos_parser__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/caos-kt/caos-parser */ "../caos-kt/dist/caos-parser.mjs");
-/* harmony import */ var _creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @creatures-lsp/caos-util */ "../caos-util/lib/goto.js");
+/* harmony import */ var _creatures_lsp_caos_cursor_data__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos/cursor-data */ "../caos-kt/dist/caos-cursor-data.mjs");
+/* harmony import */ var _creatures_lsp_caos_parser__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/caos/parser */ "../caos-kt/dist/caos-parser.mjs");
+/* harmony import */ var _creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @creatures-lsp/caos */ "../caos/dist/goto.js");
 /* harmony import */ var _caos_caos_init_lib_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./caos/caos-init-lib.js */ "./src/caos/caos-init-lib.ts");
 /* harmony import */ var _connection_vscode_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./connection.vscode.js */ "./src/connection.vscode.ts");
 /* harmony import */ var _document_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./document.js */ "./src/document.ts");
@@ -114443,7 +114460,7 @@ function _onDefinition(params) {
 }
 function getCaosGotoDefinitions(uri, document, position) {
     try {
-        let definitions = (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_2__.getGotoInformation)(uri, document.variant, document.text, position.line, position.character);
+        let definitions = (0,_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_2__.getGotoInformation)(uri, document.variant, document.text, position.line, position.character);
         if (definitions == null) {
             definitions = getIndexedDefinition(document, position);
         }
@@ -114472,7 +114489,7 @@ function getCaosGotoDefinitions(uri, document, position) {
 function getIndexedDefinition(document, position) {
     var _a, _b, _c, _d, _e;
     const { variant, text } = document;
-    let parseResult = (0,_creatures_lsp_caos_kt_caos_parser__WEBPACK_IMPORTED_MODULE_1__.parseCaosNear)(variant, text, position.line, position.character, false);
+    let parseResult = (0,_creatures_lsp_caos_parser__WEBPACK_IMPORTED_MODULE_1__.parseCaosNear)(variant, text, position.line, position.character, false);
     if (parseResult == null) {
         return null;
     }
@@ -114480,7 +114497,7 @@ function getIndexedDefinition(document, position) {
     if (commandCalls.length === 0) {
         return null;
     }
-    const cursor = (0,_creatures_lsp_caos_kt_caos_cursor_data__WEBPACK_IMPORTED_MODULE_0__.getCaosCursorPosition)(parseResult, position.line, position.character, false);
+    const cursor = (0,_creatures_lsp_caos_cursor_data__WEBPACK_IMPORTED_MODULE_0__.getCaosCursorPosition)(parseResult, position.line, position.character, false);
     if (cursor == null) {
         return null;
     }
@@ -114508,7 +114525,7 @@ function getCatalogueNameSymbol(workspaceUri, documentUri, parseResult, command,
     }
     const { line, character } = position;
     const commandCall = parseResult.commandCalls.find(c => c.commandString.toUpperCase() === command && (0,_creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_7__.inRange)(c.textRange, line, character, false, true));
-    if (!(0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_2__.isInCaosCatalogueKey)(commandCall, closestItem)) {
+    if (!(0,_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_2__.isInCaosCatalogueKey)(commandCall, closestItem)) {
         return null;
     }
     const key = closestItem.value;
@@ -114612,7 +114629,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   registerInlayHints: () => (/* binding */ registerInlayHints)
 /* harmony export */ });
-/* harmony import */ var _creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos-util */ "../caos-util/lib/inlay-hints.js");
+/* harmony import */ var _creatures_lsp_caos_inlay_hints__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos/inlay-hints */ "../caos/dist/inlay-hints.js");
 /* harmony import */ var _document_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./document.js */ "./src/document.ts");
 /* harmony import */ var _connection_vscode_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./connection.vscode.js */ "./src/connection.vscode.ts");
 /* harmony import */ var _caos_caos_init_lib_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./caos/caos-init-lib.js */ "./src/caos/caos-init-lib.ts");
@@ -114660,7 +114677,7 @@ function _onInlayHints(params) {
         if ((0,_document_js__WEBPACK_IMPORTED_MODULE_1__.isCaosDocument)(document)) {
             (0,_caos_caos_init_lib_js__WEBPACK_IMPORTED_MODULE_3__.caosInitLib)();
             const minimumParameterHints = (_b = (_a = document.settings.inlayHints) === null || _a === void 0 ? void 0 : _a.parameterHints) === null || _b === void 0 ? void 0 : _b.minimumParameterCountForParameterInlayHints;
-            return (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_0__.getCaosDocumentInlayHints)(document.variant, document.text, (_c = document.settings.disabledInlayHints) !== null && _c !== void 0 ? _c : [], minimumParameterHints);
+            return (0,_creatures_lsp_caos_inlay_hints__WEBPACK_IMPORTED_MODULE_0__.getCaosInlayHintsWithOffset)(document.variant, document.text, (_c = document.settings.disabledInlayHints) !== null && _c !== void 0 ? _c : [], minimumParameterHints);
         }
         return [];
     });
@@ -114847,7 +114864,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ });
 /* harmony import */ var _connection_vscode_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./connection.vscode.js */ "./src/connection.vscode.ts");
 /* harmony import */ var _caos_caos_init_lib_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./caos/caos-init-lib.js */ "./src/caos/caos-init-lib.ts");
-/* harmony import */ var _creatures_lsp_caos_kt_caos_cursor_data__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @creatures-lsp/caos-kt/caos-cursor-data */ "../caos-kt/dist/caos-cursor-data.mjs");
+/* harmony import */ var _creatures_lsp_caos_cursor_data__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @creatures-lsp/caos/cursor-data */ "../caos-kt/dist/caos-cursor-data.mjs");
 /* harmony import */ var _document_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./document.js */ "./src/document.ts");
 /* harmony import */ var _rename_rename_caos_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./rename/rename.caos.js */ "./src/rename/rename.caos.ts");
 /* harmony import */ var _rename_rename_catalogue_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./rename/rename.catalogue.js */ "./src/rename/rename.catalogue.ts");
@@ -114895,7 +114912,7 @@ function onPrepareRename(params) {
         if ((0,_document_js__WEBPACK_IMPORTED_MODULE_3__.isCaosDocument)(document)) {
             (0,_caos_caos_init_lib_js__WEBPACK_IMPORTED_MODULE_1__.caosInitLib)();
             const { variant, text } = document;
-            closestItem = (_a = (0,_creatures_lsp_caos_kt_caos_cursor_data__WEBPACK_IMPORTED_MODULE_2__.getCaosCursorPositionFromRawText)(variant, text, line, character, true)) === null || _a === void 0 ? void 0 : _a.closestItem;
+            closestItem = (_a = (0,_creatures_lsp_caos_cursor_data__WEBPACK_IMPORTED_MODULE_2__.getCaosCursorPositionFromRawText)(variant, text, line, character, true)) === null || _a === void 0 ? void 0 : _a.closestItem;
         }
         else if ((0,_document_js__WEBPACK_IMPORTED_MODULE_3__.isCatalogueDocument)(document)) {
             closestItem = (0,_catalogue_catalogue_util_js__WEBPACK_IMPORTED_MODULE_6__.getCatalogueNameUnderCursor)(document.text, line, character);
@@ -114951,7 +114968,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _document_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./document.js */ "./src/document.ts");
 /* harmony import */ var _caos_settings_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./caos/settings.js */ "./src/caos/settings.ts");
 /* harmony import */ var _catalogue_settings_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./catalogue/settings.js */ "./src/catalogue/settings.ts");
-/* harmony import */ var _creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @creatures-lsp/caos-util */ "../caos-util/lib/semantic-highlighter.js");
+/* harmony import */ var _creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @creatures-lsp/caos */ "../caos/dist/semantic-highlighter.js");
 /* harmony import */ var _caos_caos_init_lib_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./caos/caos-init-lib.js */ "./src/caos/caos-init-lib.ts");
 /* harmony import */ var _ConnLogger_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./ConnLogger.js */ "./src/ConnLogger.ts");
 var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
@@ -115010,7 +115027,7 @@ function _onSemanticTokens(params, token) {
         switch (languageId) {
             case _caos_settings_js__WEBPACK_IMPORTED_MODULE_2__.CAOS_LANGUAGE_ID:
                 (0,_caos_caos_init_lib_js__WEBPACK_IMPORTED_MODULE_5__.caosInitLib)();
-                return (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_4__.getCaosDocumentSemanticTokens)((_a = document.variant) !== null && _a !== void 0 ? _a : "DS", text, token);
+                return (0,_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_4__.getCaosDocumentSemanticTokens)((_a = document.variant) !== null && _a !== void 0 ? _a : "DS", text, token);
             case _catalogue_settings_js__WEBPACK_IMPORTED_MODULE_3__.CATALOGUE_LANGUAGE_ID:
             // try {
             //     return getCatalogueDocumentSemanticTokens(text, token);
@@ -115042,7 +115059,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   renameInCaosDocument: () => (/* binding */ renameInCaosDocument)
 /* harmony export */ });
 /* harmony import */ var _caos_caos_command_call_positional_data_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../caos/caos.command-call-positional-data.js */ "./src/caos/caos.command-call-positional-data.ts");
-/* harmony import */ var _creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/caos-util */ "../caos-util/lib/is-util.js");
+/* harmony import */ var _creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/caos */ "../caos/dist/is-util.js");
 /* harmony import */ var _indices_index_caos_named_variables_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../indices/index.caos.named-variables.js */ "./src/indices/index.caos.named-variables.ts");
 /* harmony import */ var _workspace_folders_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../workspace-folders.js */ "./src/workspace-folders.ts");
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/position-utils.js");
@@ -115093,7 +115110,7 @@ function renameCatalogueTagInCaos(workspaceUri, documentUri, positionData, newTa
     if (closestItem == null) {
         return null;
     }
-    if (!_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__.Is.c2eStringVal(closestItem)) {
+    if (!_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_1__.Is.c2eStringVal(closestItem)) {
         return null;
     }
     const oldTag = closestItem.value;
@@ -115126,7 +115143,7 @@ function renameCaosNamedVariable(workspaceUri, documentUri, positionData, prefix
     if (closestItem == null) {
         return null;
     }
-    if (!_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__.Is.c2eStringVal(closestItem)) {
+    if (!_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_1__.Is.c2eStringVal(closestItem)) {
         return null;
     }
     const oldText = closestItem.value;
@@ -115166,7 +115183,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   renameCatalogueInCatalogueAndCaosFiles: () => (/* binding */ renameCatalogueInCatalogueAndCaosFiles),
 /* harmony export */   renameInCatalogueDocument: () => (/* binding */ renameInCatalogueDocument)
 /* harmony export */ });
-/* harmony import */ var _creatures_lsp_caos_kt_catalogue_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/caos-kt/catalogue-core */ "../caos-kt/dist/catalogue-core.mjs");
+/* harmony import */ var _creatures_lsp_catalogue_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @creatures-lsp/catalogue/core */ "../caos-kt/dist/catalogue-core.mjs");
 /* harmony import */ var _indices_index_catalogue_entries_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../indices/index.catalogue.entries.js */ "./src/indices/index.catalogue.entries.ts");
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/position-utils.js");
 /* harmony import */ var _creatures_lsp_extension_util__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @creatures-lsp/extension-util */ "../extension-util/dist/lsp-runner.js");
@@ -115184,7 +115201,7 @@ __webpack_require__.r(__webpack_exports__);
 function renameInCatalogueDocument(document, position, newTagName) {
     var _a, _b;
     const workspaceUri = (0,_workspace_folders_js__WEBPACK_IMPORTED_MODULE_6__.getWorkspaceUriForFile)(document.documentUri);
-    const parseResult = (0,_creatures_lsp_caos_kt_catalogue_core__WEBPACK_IMPORTED_MODULE_0__.parseCatalogue)(document.text);
+    const parseResult = (0,_creatures_lsp_catalogue_core__WEBPACK_IMPORTED_MODULE_0__.parseCatalogue)(document.text);
     const { line, character } = position;
     const tag = parseResult
         .catalogueEntries
@@ -116043,7 +116060,7 @@ var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var vscode_languageserver_node_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! vscode-languageserver/node.js */ "../../node_modules/vscode-languageserver/node.js");
 /* harmony import */ var vscode_languageserver_node_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(vscode_languageserver_node_js__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/caos-util */ "../caos-util/lib/semantic-highlighter.js");
+/* harmony import */ var _creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @creatures-lsp/caos */ "../caos/dist/semantic-highlighter.js");
 /* harmony import */ var _documents_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./documents.js */ "./src/documents.ts");
 /* harmony import */ var _client_capabilities_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./client-capabilities.js */ "./src/client-capabilities.ts");
 /* harmony import */ var _caos_settings_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./caos/settings.js */ "./src/caos/settings.ts");
@@ -116175,7 +116192,7 @@ _connection_vscode_js__WEBPACK_IMPORTED_MODULE_5__.connection.onInitialize((para
                 documentSelector: [
                     { language: _caos_settings_js__WEBPACK_IMPORTED_MODULE_4__.CAOS_LANGUAGE_ID }
                 ],
-                legend: (0,_creatures_lsp_caos_util__WEBPACK_IMPORTED_MODULE_1__.getSemanticTokensLegend)(),
+                legend: (0,_creatures_lsp_caos__WEBPACK_IMPORTED_MODULE_1__.getSemanticTokensLegend)(),
                 full: true,
             } : undefined,
             // Server and client allows hover documentation