diff --git a/case.ts b/case.ts
deleted file mode 100644
index da2cd2a..0000000
--- a/case.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-namespace switchcase {
-
-    /**
-     * Case Block Container
-     */
-    //% block="case $match"
-    //% blockId=switchcase_case_block
-    //% group="Control"
-    //% weight=90
-    //% draggableParameters
-    //% draggableStatement=true
-    export function caseBlock(match: any): void {
-        //Placeholder for CodeGen
-    }
-
-    /**
-     * Default-Case Block Container
-     */
-    //% block="default case"
-    //% blockId=switchcase_default_case_block
-    //% group="Control"
-    //% weight=80
-    //% draggableStatement=true
-    export function defaultCaseBlock(): void {
-        //Placeholder for CodeGen
-    }
-
-}
diff --git a/caseblock.ts b/caseblock.ts
new file mode 100644
index 0000000..2a54160
--- /dev/null
+++ b/caseblock.ts
@@ -0,0 +1,32 @@
+import {SwitchContext} from './classes/SwitchContext'
+import {SwitchManager} from './classes/SwitchManager'
+
+
+namespace switchcase {
+
+  /**
+   * Case Block Container
+   */
+  //% block="case $match"
+  //% blockId=switchcase_case_block
+  //% group="Control"
+  //% weight=90
+  //% draggableParameters
+  //% draggableStatement=true
+  export function caseBlock(match: any): void {
+    //Placeholder for CodeGen
+  }
+
+  /**
+   * Default-Case Block Container
+   */
+  //% block="default case"
+  //% blockId=switchcase_default_case_block
+  //% group="Control"
+  //% weight=80
+  //% draggableStatement=true
+  export function defaultCaseBlock(): void {
+    //Placeholder for CodeGen
+  }
+
+}