diff --git a/abaplint.jsonc b/abaplint.jsonc
index c7c1a3c..9a73dbe 100644
--- a/abaplint.jsonc
+++ b/abaplint.jsonc
@@ -167,7 +167,16 @@
     "check_ddic": true,
     "implement_methods": true,
     "indentation": true,
-    "keyword_case": true,
+    "keyword_case": {
+      "style": "upper",
+      "ignoreExceptions": false,
+      "ignoreLowerClassImplmentationStatement": false,
+      "ignoreGlobalClassDefinition": false,
+      "ignoreGlobalInterface": false,
+      "ignoreFunctionModuleName": false,
+      "ignoreGlobalClassBoundaries": false,
+      "ignoreKeywords": []
+    },
     "when_others_last": true,
     "newline_between_methods": true,
     "avoid_use": {
diff --git a/package.json b/package.json
index c51ac4d..372a4b1 100644
--- a/package.json
+++ b/package.json
@@ -11,9 +11,9 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@abaplint/cli": "^2.113.176",
-    "@abaplint/runtime": "^2.11.34",
+    "@abaplint/cli": "^2.113.188",
+    "@abaplint/runtime": "^2.11.62",
     "@abaplint/database-sqlite": "^2.11.0",
-    "@abaplint/transpiler-cli": "^2.11.34"
+    "@abaplint/transpiler-cli": "^2.11.62"
   }
 }
diff --git a/src/salv/cx_salv_access_error.clas.abap b/src/salv/exceptions/cx_salv_access_error.clas.abap
similarity index 100%
rename from src/salv/cx_salv_access_error.clas.abap
rename to src/salv/exceptions/cx_salv_access_error.clas.abap
diff --git a/src/salv/cx_salv_data_error.clas.abap b/src/salv/exceptions/cx_salv_data_error.clas.abap
similarity index 100%
rename from src/salv/cx_salv_data_error.clas.abap
rename to src/salv/exceptions/cx_salv_data_error.clas.abap
diff --git a/src/salv/cx_salv_error.clas.abap b/src/salv/exceptions/cx_salv_error.clas.abap
similarity index 100%
rename from src/salv/cx_salv_error.clas.abap
rename to src/salv/exceptions/cx_salv_error.clas.abap
diff --git a/src/salv/cx_salv_existing.clas.abap b/src/salv/exceptions/cx_salv_existing.clas.abap
similarity index 100%
rename from src/salv/cx_salv_existing.clas.abap
rename to src/salv/exceptions/cx_salv_existing.clas.abap
diff --git a/src/salv/exceptions/cx_salv_method_not_supported.clas.abap b/src/salv/exceptions/cx_salv_method_not_supported.clas.abap
new file mode 100644
index 0000000..23e2170
--- /dev/null
+++ b/src/salv/exceptions/cx_salv_method_not_supported.clas.abap
@@ -0,0 +1,7 @@
+CLASS cx_salv_method_not_supported DEFINITION PUBLIC INHERITING FROM cx_no_check.
+  PUBLIC SECTION.
+ENDCLASS.
+
+CLASS cx_salv_method_not_supported IMPLEMENTATION.
+
+ENDCLASS.
\ No newline at end of file
diff --git a/src/salv/cx_salv_msg.clas.abap b/src/salv/exceptions/cx_salv_msg.clas.abap
similarity index 100%
rename from src/salv/cx_salv_msg.clas.abap
rename to src/salv/exceptions/cx_salv_msg.clas.abap
diff --git a/src/salv/exceptions/cx_salv_no_check.clas.abap b/src/salv/exceptions/cx_salv_no_check.clas.abap
new file mode 100644
index 0000000..540ab5b
--- /dev/null
+++ b/src/salv/exceptions/cx_salv_no_check.clas.abap
@@ -0,0 +1,7 @@
+CLASS cx_salv_no_check DEFINITION PUBLIC INHERITING FROM cx_no_check.
+  PUBLIC SECTION.
+ENDCLASS.
+
+CLASS cx_salv_no_check IMPLEMENTATION.
+
+ENDCLASS.
\ No newline at end of file
diff --git a/src/salv/cx_salv_not_found.clas.abap b/src/salv/exceptions/cx_salv_not_found.clas.abap
similarity index 100%
rename from src/salv/cx_salv_not_found.clas.abap
rename to src/salv/exceptions/cx_salv_not_found.clas.abap
diff --git a/src/salv/cx_salv_static_check.clas.abap b/src/salv/exceptions/cx_salv_static_check.clas.abap
similarity index 100%
rename from src/salv/cx_salv_static_check.clas.abap
rename to src/salv/exceptions/cx_salv_static_check.clas.abap
diff --git a/src/salv/exceptions/cx_salv_wrong_call.clas.abap b/src/salv/exceptions/cx_salv_wrong_call.clas.abap
new file mode 100644
index 0000000..7794fa8
--- /dev/null
+++ b/src/salv/exceptions/cx_salv_wrong_call.clas.abap
@@ -0,0 +1,7 @@
+CLASS cx_salv_wrong_call DEFINITION PUBLIC INHERITING FROM cx_salv_access_error.
+  PUBLIC SECTION.
+ENDCLASS.
+
+CLASS cx_salv_wrong_call IMPLEMENTATION.
+
+ENDCLASS.
\ No newline at end of file