diff --git a/src/App.vue b/src/App.vue
index 4391a83..4aa4eaf 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,13 +1,20 @@
 <script setup lang="ts">
-import LoadingTitle from '@/views/LoadingTitle.vue';
-import Footer from '@/views/Footer.vue'
+  import { ref, onErrorCaptured, } from 'vue';
+  import LoadingTitle from '@/components/LoadingTitle.vue';
+  import Footer from '@/views/Footer.vue'
+
+  const errorMessage = ref('')
+  onErrorCaptured((error, _instance, info) => 
+  {
+    errorMessage.value = `❌ Error in ${info}, ${error}`
+  })
 </script>
 
 <template>
   <div class="main-layout">
     <div class="main-content-layout">
 
-      <RouterView v-slot="{ Component }">
+      <RouterView v-if="!errorMessage" v-slot="{ Component }">
         <template v-if="Component">
           <Suspense :timeout="100">
 
@@ -19,6 +26,7 @@ import Footer from '@/views/Footer.vue'
           </Suspense>
         </template>
       </RouterView>
+      <LoadingTitle v-else :message="errorMessage" />
 
     </div>
     <div class="main-footer-layout">
diff --git a/src/scripts/common.ts b/src/common/common.ts
similarity index 94%
rename from src/scripts/common.ts
rename to src/common/common.ts
index 58eb560..3be0e82 100644
--- a/src/scripts/common.ts
+++ b/src/common/common.ts
@@ -54,7 +54,7 @@ export function cleanupMarkup(value?:string) : string
         .replace(/\\n/gi, " ")
 }
 
-export function cleanGamecoreName(value: string) 
+export function cleanupTaskName(value: string) 
 {
     var parts = value.split('.');
     if (parts.length === 3)
@@ -72,7 +72,7 @@ export function cleanupFilename(path:string) : string
     return ''
 }
 
-export function gamecoreToComponentName(value: string) 
+export function taskTypeToComponentName(value: string) 
 {
     var parts = value.split('.');
     if (parts.length === 3)
diff --git a/src/scripts/datasource.ts b/src/common/datasource.ts
similarity index 100%
rename from src/scripts/datasource.ts
rename to src/common/datasource.ts
diff --git a/src/scripts/hashstore.ts b/src/common/hashstore.ts
similarity index 100%
rename from src/scripts/hashstore.ts
rename to src/common/hashstore.ts
diff --git a/src/scripts/mutex.ts b/src/common/mutex.ts
similarity index 100%
rename from src/scripts/mutex.ts
rename to src/common/mutex.ts
diff --git a/src/scripts/translate.ts b/src/common/translate.ts
similarity index 100%
rename from src/scripts/translate.ts
rename to src/common/translate.ts
diff --git a/src/views/gamecore/BlockLayout.vue b/src/components/BlockLayout.vue
similarity index 100%
rename from src/views/gamecore/BlockLayout.vue
rename to src/components/BlockLayout.vue
diff --git a/src/views/LoadingNav.vue b/src/components/LoadingNav.vue
similarity index 100%
rename from src/views/LoadingNav.vue
rename to src/components/LoadingNav.vue
diff --git a/src/views/LoadingTitle.vue b/src/components/LoadingTitle.vue
similarity index 100%
rename from src/views/LoadingTitle.vue
rename to src/components/LoadingTitle.vue
diff --git a/src/components/NavTree.vue b/src/components/NavTree.vue
index 493e5f8..6f3c8b3 100644
--- a/src/components/NavTree.vue
+++ b/src/components/NavTree.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
   import { Ref, inject, ref, computed, useSlots, provide, } from 'vue';
-  import LoadingNav from '@/views/LoadingNav.vue';
+  import LoadingNav from '@/components/LoadingNav.vue';
 
   const slots = useSlots()
   const props = defineProps<{startsOpen?:boolean, forceOpen?:boolean}>()
diff --git a/src/gamecore/AnyTask.vue b/src/gamecore/AnyTask.vue
new file mode 100644
index 0000000..5f0a2a4
--- /dev/null
+++ b/src/gamecore/AnyTask.vue
@@ -0,0 +1,31 @@
+<script setup lang="ts">
+  import { defineAsyncComponent, } from 'vue'
+  import { GamecoreTask, } from '@/sources/gamecore';
+  import { taskTypeToComponentName, } from '@/common/common';
+
+  const props = defineProps<{node:GamecoreTask}>()
+  const taskName = taskTypeToComponentName(props.node.$type)
+  const taskComponent = defineAsyncComponent({
+    loader: async () => 
+    {
+      try { return await import(`./tasks/${taskName}.vue`) }
+      catch (error:any) 
+      { 
+        if (!error.toString().includes('Unknown variable dynamic import'))
+          console.error(error)
+        return await import(`./MissingTask.vue`)
+      }
+    },
+  })
+  const inversibleNode = props.node as unknown as 
+  {
+    Inverse:boolean
+  }
+</script>
+
+<template>
+  <component :is="taskComponent" :node="node" :class="inversibleNode.Inverse ? 'inverted' : ''" />
+</template>
+
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/gamecore/EvaluateExpression.vue b/src/gamecore/EvaluateExpression.vue
similarity index 51%
rename from src/views/gamecore/EvaluateExpression.vue
rename to src/gamecore/EvaluateExpression.vue
index df405f1..4a4a3a6 100644
--- a/src/views/gamecore/EvaluateExpression.vue
+++ b/src/gamecore/EvaluateExpression.vue
@@ -1,15 +1,15 @@
 <script setup lang="ts">
   import { inject, Ref, } from 'vue';
-  import { GamecoreContext,
+  import { ExpressionContext,
     DynamicExpression, evaluateDynamicExpression,
-  } from '@/scripts/sources/gamecore';
+  } from '@/sources/gamecore';
 
   defineProps<{expression?:DynamicExpression}>()
-  const gamecoreContext = inject('gamecoreContext') as Ref<GamecoreContext>
+  const expressionContext = inject('expressionContext') as Ref<ExpressionContext>
 </script>
 
 <template>
-  {{ evaluateDynamicExpression(expression, gamecoreContext) }}
+  {{ evaluateDynamicExpression(expression, expressionContext) }}
 </template>
 
 <style scoped>
diff --git a/src/gamecore/MissingTask.vue b/src/gamecore/MissingTask.vue
new file mode 100644
index 0000000..bf555d3
--- /dev/null
+++ b/src/gamecore/MissingTask.vue
@@ -0,0 +1,16 @@
+<script setup lang="ts">
+  import { GamecoreTask, } from '@/sources/gamecore';
+  import { cleanupTaskName, } from '@/common/common';
+  import BlockLayout from '@/components/BlockLayout.vue';
+
+  defineProps<{node:GamecoreTask}>()
+</script>
+
+<template>
+  <BlockLayout :source="node">
+    <span class="notimplemented">{{ cleanupTaskName(node.$type) }}</span>
+  </BlockLayout>
+</template>
+
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/gamecore/blocks/AddModifier.vue b/src/gamecore/tasks/AddModifier.vue
similarity index 80%
rename from src/views/gamecore/blocks/AddModifier.vue
rename to src/gamecore/tasks/AddModifier.vue
index 68a3fc5..665a334 100644
--- a/src/views/gamecore/blocks/AddModifier.vue
+++ b/src/gamecore/tasks/AddModifier.vue
@@ -1,16 +1,16 @@
 <script setup lang="ts">
   import { inject } from 'vue';
-  import { getHash } from '@/scripts/translate';
-  import { GamecoreNode, 
+  import { getHash } from '@/common/translate';
+  import { GamecoreTask, 
     GamecoreTargetType, evaluateTargetType, 
     DynamicExpression, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
-  import useHashStore from '@/scripts/hashstore';
-import AnyBlock from '../AnyBlock.vue';
+  import useHashStore from '@/common/hashstore';
+  import AnyTask from '../AnyTask.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
@@ -24,9 +24,9 @@ import AnyBlock from '../AnyBlock.vue';
     {
       [key:string]:DynamicExpression
     }
-    SuccessTaskList?:GamecoreNode[]
-    FailTaskList?:GamecoreNode[]
-    ResistedTaskList?:GamecoreNode[]
+    SuccessTaskList?:GamecoreTask[]
+    FailTaskList?:GamecoreTask[]
+    ResistedTaskList?:GamecoreTask[]
   }
   
   if (node.DynamicValues)
@@ -43,7 +43,7 @@ import AnyBlock from '../AnyBlock.vue';
 <template>
   <BlockLayout :source="node">
 
-    Add 
+    Apply 
     <template v-if="node.LayerAddWhenStack">
       <em><EvaluateExpression :expression="node.LayerAddWhenStack" /></em> stacks of
     </template>
@@ -78,15 +78,15 @@ import AnyBlock from '../AnyBlock.vue';
       <div class="subblock">
         <template v-if="node.SuccessTaskList">
           <span class="flow">On Success</span>
-          <AnyBlock v-for="n in node.SuccessTaskList" :node="n" />
+          <AnyTask v-for="n in node.SuccessTaskList" :node="n" />
         </template>
         <template v-if="node.FailTaskList">
           <span class="flow">On Failure</span>
-          <AnyBlock v-for="n in node.FailTaskList" :node="n" />
+          <AnyTask v-for="n in node.FailTaskList" :node="n" />
         </template>
         <template v-if="node.ResistedTaskList">
           <span class="flow">On Resist</span>
-          <AnyBlock v-for="n in node.ResistedTaskList" :node="n" />
+          <AnyTask v-for="n in node.ResistedTaskList" :node="n" />
         </template>
       </div>
     </template>
diff --git a/src/gamecore/tasks/ByAnd.vue b/src/gamecore/tasks/ByAnd.vue
new file mode 100644
index 0000000..2e10967
--- /dev/null
+++ b/src/gamecore/tasks/ByAnd.vue
@@ -0,0 +1,24 @@
+<script setup lang="ts">
+  import { GamecoreTask, 
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
+  import AnyTask from '../AnyTask.vue';
+
+  const props = defineProps<{node:GamecoreTask}>()
+  const node = props.node as unknown as 
+  {
+    PredicateList:GamecoreTask[]
+  }
+</script>
+
+<template>
+  <BlockLayout :source="node">
+    <span class="flow">All</span>
+    <template #content>
+      <AnyTask v-for="predicate in node.PredicateList" :node="predicate" />
+    </template>
+  </BlockLayout>
+</template>
+
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/src/gamecore/tasks/ByAny.vue b/src/gamecore/tasks/ByAny.vue
new file mode 100644
index 0000000..264fae0
--- /dev/null
+++ b/src/gamecore/tasks/ByAny.vue
@@ -0,0 +1,24 @@
+<script setup lang="ts">
+  import { GamecoreTask, 
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
+  import AnyTask from '../AnyTask.vue';
+
+  const props = defineProps<{node:GamecoreTask}>()
+  const node = props.node as unknown as 
+  {
+    PredicateList:GamecoreTask[]
+  }
+</script>
+
+<template>
+  <BlockLayout :source="node">
+    <span class="flow">Any</span>
+    <template #content>
+      <AnyTask v-for="predicate in node.PredicateList" :node="predicate" />
+    </template>
+  </BlockLayout>
+</template>
+
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/gamecore/blocks/ByAttackType.vue b/src/gamecore/tasks/ByAttackType.vue
similarity index 60%
rename from src/views/gamecore/blocks/ByAttackType.vue
rename to src/gamecore/tasks/ByAttackType.vue
index b26bcd9..28a38b6 100644
--- a/src/views/gamecore/blocks/ByAttackType.vue
+++ b/src/gamecore/tasks/ByAttackType.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  import { GamecoreTask, 
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     AttackTypes:string[]
diff --git a/src/views/gamecore/blocks/ByAvatarBaseType.vue b/src/gamecore/tasks/ByAvatarBaseType.vue
similarity index 69%
rename from src/views/gamecore/blocks/ByAvatarBaseType.vue
rename to src/gamecore/tasks/ByAvatarBaseType.vue
index 13ba8d6..19ea182 100644
--- a/src/views/gamecore/blocks/ByAvatarBaseType.vue
+++ b/src/gamecore/tasks/ByAvatarBaseType.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType, evaluateTargetType, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/ByCharacterDamageType.vue b/src/gamecore/tasks/ByCharacterDamageType.vue
similarity index 68%
rename from src/views/gamecore/blocks/ByCharacterDamageType.vue
rename to src/gamecore/tasks/ByCharacterDamageType.vue
index 4d52abf..7feccdc 100644
--- a/src/views/gamecore/blocks/ByCharacterDamageType.vue
+++ b/src/gamecore/tasks/ByCharacterDamageType.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType, evaluateTargetType, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/ByCompareAbilityProperty.vue b/src/gamecore/tasks/ByCompareAbilityProperty.vue
similarity index 81%
rename from src/views/gamecore/blocks/ByCompareAbilityProperty.vue
rename to src/gamecore/tasks/ByCompareAbilityProperty.vue
index 00defe3..090cc51 100644
--- a/src/views/gamecore/blocks/ByCompareAbilityProperty.vue
+++ b/src/gamecore/tasks/ByCompareAbilityProperty.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     DynamicExpression,
     GamecoreTargetType, evaluateTargetType, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/ByCompareBP.vue b/src/gamecore/tasks/ByCompareBP.vue
similarity index 76%
rename from src/views/gamecore/blocks/ByCompareBP.vue
rename to src/gamecore/tasks/ByCompareBP.vue
index a56f5ec..dcde0cf 100644
--- a/src/views/gamecore/blocks/ByCompareBP.vue
+++ b/src/gamecore/tasks/ByCompareBP.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     DynamicExpression,
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     CompareType:string
diff --git a/src/views/gamecore/blocks/ByCompareCharacterNumber.vue b/src/gamecore/tasks/ByCompareCharacterNumber.vue
similarity index 80%
rename from src/views/gamecore/blocks/ByCompareCharacterNumber.vue
rename to src/gamecore/tasks/ByCompareCharacterNumber.vue
index cb911c1..4dae7e9 100644
--- a/src/views/gamecore/blocks/ByCompareCharacterNumber.vue
+++ b/src/gamecore/tasks/ByCompareCharacterNumber.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     DynamicExpression,
     GamecoreTargetType, evaluateTargetType, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/ByCompareDynamicValue.vue b/src/gamecore/tasks/ByCompareDynamicValue.vue
similarity index 76%
rename from src/views/gamecore/blocks/ByCompareDynamicValue.vue
rename to src/gamecore/tasks/ByCompareDynamicValue.vue
index 02ba4ed..4c934fa 100644
--- a/src/views/gamecore/blocks/ByCompareDynamicValue.vue
+++ b/src/gamecore/tasks/ByCompareDynamicValue.vue
@@ -1,13 +1,13 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType, evaluateTargetType, 
     DynamicExpression, 
-  } from '@/scripts/sources/gamecore';
-  import useHashStore from '@/scripts/hashstore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import useHashStore from '@/common/hashstore';
+  import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/ByCompareHP.vue b/src/gamecore/tasks/ByCompareHP.vue
similarity index 80%
rename from src/views/gamecore/blocks/ByCompareHP.vue
rename to src/gamecore/tasks/ByCompareHP.vue
index cfc30fb..9ccb6ac 100644
--- a/src/views/gamecore/blocks/ByCompareHP.vue
+++ b/src/gamecore/tasks/ByCompareHP.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     DynamicExpression,
     GamecoreTargetType, evaluateTargetType, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/ByCompareHPRatio.vue b/src/gamecore/tasks/ByCompareHPRatio.vue
similarity index 81%
rename from src/views/gamecore/blocks/ByCompareHPRatio.vue
rename to src/gamecore/tasks/ByCompareHPRatio.vue
index 7f160c4..f228221 100644
--- a/src/views/gamecore/blocks/ByCompareHPRatio.vue
+++ b/src/gamecore/tasks/ByCompareHPRatio.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     DynamicExpression,
     GamecoreTargetType, evaluateTargetType, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/ByCompareModifierValue.vue b/src/gamecore/tasks/ByCompareModifierValue.vue
similarity index 84%
rename from src/views/gamecore/blocks/ByCompareModifierValue.vue
rename to src/gamecore/tasks/ByCompareModifierValue.vue
index e9dd021..cfca2b0 100644
--- a/src/views/gamecore/blocks/ByCompareModifierValue.vue
+++ b/src/gamecore/tasks/ByCompareModifierValue.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
   import { inject, } from 'vue';
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     DynamicExpression, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     ModifierName:string
diff --git a/src/views/gamecore/blocks/ByCompareMonsterPhase.vue b/src/gamecore/tasks/ByCompareMonsterPhase.vue
similarity index 82%
rename from src/views/gamecore/blocks/ByCompareMonsterPhase.vue
rename to src/gamecore/tasks/ByCompareMonsterPhase.vue
index 6a2eedb..eca6115 100644
--- a/src/views/gamecore/blocks/ByCompareMonsterPhase.vue
+++ b/src/gamecore/tasks/ByCompareMonsterPhase.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     DynamicExpression,
     GamecoreTargetType, evaluateTargetType, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/ByCompareMonsterRank.vue b/src/gamecore/tasks/ByCompareMonsterRank.vue
similarity index 81%
rename from src/views/gamecore/blocks/ByCompareMonsterRank.vue
rename to src/gamecore/tasks/ByCompareMonsterRank.vue
index 7d1ecfe..dded95e 100644
--- a/src/views/gamecore/blocks/ByCompareMonsterRank.vue
+++ b/src/gamecore/tasks/ByCompareMonsterRank.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     DynamicExpression,
     GamecoreTargetType, evaluateTargetType, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/ByCompareParamValue.vue b/src/gamecore/tasks/ByCompareParamValue.vue
similarity index 76%
rename from src/views/gamecore/blocks/ByCompareParamValue.vue
rename to src/gamecore/tasks/ByCompareParamValue.vue
index 81a121e..acf113e 100644
--- a/src/views/gamecore/blocks/ByCompareParamValue.vue
+++ b/src/gamecore/tasks/ByCompareParamValue.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     DynamicExpression,
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     CompareType:string
diff --git a/src/views/gamecore/blocks/ByCompareTarget.vue b/src/gamecore/tasks/ByCompareTarget.vue
similarity index 69%
rename from src/views/gamecore/blocks/ByCompareTarget.vue
rename to src/gamecore/tasks/ByCompareTarget.vue
index 8c1e394..4389bb3 100644
--- a/src/views/gamecore/blocks/ByCompareTarget.vue
+++ b/src/gamecore/tasks/ByCompareTarget.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType, evaluateTargetType, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/ByCompareTurnActionEntityTeamType.vue b/src/gamecore/tasks/ByCompareTurnActionEntityTeamType.vue
similarity index 65%
rename from src/views/gamecore/blocks/ByCompareTurnActionEntityTeamType.vue
rename to src/gamecore/tasks/ByCompareTurnActionEntityTeamType.vue
index 7d3a463..ef3c710 100644
--- a/src/views/gamecore/blocks/ByCompareTurnActionEntityTeamType.vue
+++ b/src/gamecore/tasks/ByCompareTurnActionEntityTeamType.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/ByCompareWaveCount.vue b/src/gamecore/tasks/ByCompareWaveCount.vue
similarity index 77%
rename from src/views/gamecore/blocks/ByCompareWaveCount.vue
rename to src/gamecore/tasks/ByCompareWaveCount.vue
index 59de1ba..3ded444 100644
--- a/src/views/gamecore/blocks/ByCompareWaveCount.vue
+++ b/src/gamecore/tasks/ByCompareWaveCount.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     DynamicExpression,
     GamecoreTargetType, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/ByContainBehaviorFlag.vue b/src/gamecore/tasks/ByContainBehaviorFlag.vue
similarity index 67%
rename from src/views/gamecore/blocks/ByContainBehaviorFlag.vue
rename to src/gamecore/tasks/ByContainBehaviorFlag.vue
index 3b270fb..095ec47 100644
--- a/src/views/gamecore/blocks/ByContainBehaviorFlag.vue
+++ b/src/gamecore/tasks/ByContainBehaviorFlag.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType, evaluateTargetType, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/ByCurrentSkillType.vue b/src/gamecore/tasks/ByCurrentSkillType.vue
similarity index 61%
rename from src/views/gamecore/blocks/ByCurrentSkillType.vue
rename to src/gamecore/tasks/ByCurrentSkillType.vue
index e47dcfa..c9e3eeb 100644
--- a/src/views/gamecore/blocks/ByCurrentSkillType.vue
+++ b/src/gamecore/tasks/ByCurrentSkillType.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  import { GamecoreTask, 
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     SkillType:string
diff --git a/src/views/gamecore/blocks/ByHasStanceWeak.vue b/src/gamecore/tasks/ByHasStanceWeak.vue
similarity index 71%
rename from src/views/gamecore/blocks/ByHasStanceWeak.vue
rename to src/gamecore/tasks/ByHasStanceWeak.vue
index b3bc759..1ba706e 100644
--- a/src/views/gamecore/blocks/ByHasStanceWeak.vue
+++ b/src/gamecore/tasks/ByHasStanceWeak.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType, evaluateTargetType, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/ByHaveEnemyAlive.vue b/src/gamecore/tasks/ByHaveEnemyAlive.vue
similarity index 69%
rename from src/views/gamecore/blocks/ByHaveEnemyAlive.vue
rename to src/gamecore/tasks/ByHaveEnemyAlive.vue
index f2b900c..d3dd0c1 100644
--- a/src/views/gamecore/blocks/ByHaveEnemyAlive.vue
+++ b/src/gamecore/tasks/ByHaveEnemyAlive.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType, evaluateTargetType, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/ByIsContainModifier.vue b/src/gamecore/tasks/ByIsContainModifier.vue
similarity index 78%
rename from src/views/gamecore/blocks/ByIsContainModifier.vue
rename to src/gamecore/tasks/ByIsContainModifier.vue
index 6cdfd6b..4c3379c 100644
--- a/src/views/gamecore/blocks/ByIsContainModifier.vue
+++ b/src/gamecore/tasks/ByIsContainModifier.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
   import { inject } from 'vue';
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType, evaluateTargetType, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/ByIsTargetValid.vue b/src/gamecore/tasks/ByIsTargetValid.vue
similarity index 69%
rename from src/views/gamecore/blocks/ByIsTargetValid.vue
rename to src/gamecore/tasks/ByIsTargetValid.vue
index 5a4fa36..2df796c 100644
--- a/src/views/gamecore/blocks/ByIsTargetValid.vue
+++ b/src/gamecore/tasks/ByIsTargetValid.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType, evaluateTargetType, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/ByIsTeammate.vue b/src/gamecore/tasks/ByIsTeammate.vue
similarity index 68%
rename from src/views/gamecore/blocks/ByIsTeammate.vue
rename to src/gamecore/tasks/ByIsTeammate.vue
index 01c8d1c..fbb0aac 100644
--- a/src/views/gamecore/blocks/ByIsTeammate.vue
+++ b/src/gamecore/tasks/ByIsTeammate.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType, evaluateTargetType, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/ByIsTurnActionEntity.vue b/src/gamecore/tasks/ByIsTurnActionEntity.vue
similarity index 66%
rename from src/views/gamecore/blocks/ByIsTurnActionEntity.vue
rename to src/gamecore/tasks/ByIsTurnActionEntity.vue
index c4c85e2..9af2c0f 100644
--- a/src/views/gamecore/blocks/ByIsTurnActionEntity.vue
+++ b/src/gamecore/tasks/ByIsTurnActionEntity.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType, evaluateTargetType, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/gamecore/tasks/ByNot.vue b/src/gamecore/tasks/ByNot.vue
new file mode 100644
index 0000000..eb07f0c
--- /dev/null
+++ b/src/gamecore/tasks/ByNot.vue
@@ -0,0 +1,24 @@
+<script setup lang="ts">
+  import { GamecoreTask, 
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
+  import AnyTask from '../AnyTask.vue';
+
+  const props = defineProps<{node:GamecoreTask}>()
+  const node = props.node as unknown as 
+  {
+    Predicate:GamecoreTask
+  }
+</script>
+
+<template>
+  <BlockLayout :source="node">
+    <span class="flow">Not</span>
+    <template #content>
+      <AnyTask :node="node.Predicate" />
+    </template>
+  </BlockLayout>
+</template>
+
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/gamecore/blocks/ByRandomChance.vue b/src/gamecore/tasks/ByRandomChance.vue
similarity index 67%
rename from src/views/gamecore/blocks/ByRandomChance.vue
rename to src/gamecore/tasks/ByRandomChance.vue
index a4a71ea..b3f519c 100644
--- a/src/views/gamecore/blocks/ByRandomChance.vue
+++ b/src/gamecore/tasks/ByRandomChance.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     DynamicExpression, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     Chance:DynamicExpression
diff --git a/src/views/gamecore/blocks/ByRankActivated.vue b/src/gamecore/tasks/ByRankActivated.vue
similarity index 76%
rename from src/views/gamecore/blocks/ByRankActivated.vue
rename to src/gamecore/tasks/ByRankActivated.vue
index 63d98d0..2e1376a 100644
--- a/src/views/gamecore/blocks/ByRankActivated.vue
+++ b/src/gamecore/tasks/ByRankActivated.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  import { GamecoreTask, 
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TriggerKey:
diff --git a/src/views/gamecore/blocks/BySkillPointActivated.vue b/src/gamecore/tasks/BySkillPointActivated.vue
similarity index 74%
rename from src/views/gamecore/blocks/BySkillPointActivated.vue
rename to src/gamecore/tasks/BySkillPointActivated.vue
index 0c207bb..7409104 100644
--- a/src/views/gamecore/blocks/BySkillPointActivated.vue
+++ b/src/gamecore/tasks/BySkillPointActivated.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  import { GamecoreTask, 
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     PointTriggerKey:
diff --git a/src/views/gamecore/blocks/ByTargetListIntersects.vue b/src/gamecore/tasks/ByTargetListIntersects.vue
similarity index 72%
rename from src/views/gamecore/blocks/ByTargetListIntersects.vue
rename to src/gamecore/tasks/ByTargetListIntersects.vue
index d90a632..277d977 100644
--- a/src/views/gamecore/blocks/ByTargetListIntersects.vue
+++ b/src/gamecore/tasks/ByTargetListIntersects.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType, evaluateTargetType, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     FirstTargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/ByTargetTeam.vue b/src/gamecore/tasks/ByTargetTeam.vue
similarity index 70%
rename from src/views/gamecore/blocks/ByTargetTeam.vue
rename to src/gamecore/tasks/ByTargetTeam.vue
index dbb6c0c..cd7e3f7 100644
--- a/src/views/gamecore/blocks/ByTargetTeam.vue
+++ b/src/gamecore/tasks/ByTargetTeam.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType, evaluateTargetType, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/ConditionLoopExecuteTaskList.vue b/src/gamecore/tasks/ConditionLoopExecuteTaskList.vue
similarity index 60%
rename from src/views/gamecore/blocks/ConditionLoopExecuteTaskList.vue
rename to src/gamecore/tasks/ConditionLoopExecuteTaskList.vue
index bdce5a8..adba818 100644
--- a/src/views/gamecore/blocks/ConditionLoopExecuteTaskList.vue
+++ b/src/gamecore/tasks/ConditionLoopExecuteTaskList.vue
@@ -1,14 +1,14 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
-  import AnyBlock from '@/views/gamecore/AnyBlock.vue';
+  import { GamecoreTask, 
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
+  import AnyTask from '@/gamecore/AnyTask.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
-    Predicate:GamecoreNode
-    TaskList:GamecoreNode[]
+    Predicate:GamecoreTask
+    TaskList:GamecoreTask[]
   }
 
   const predicate = node.Predicate;
@@ -20,13 +20,13 @@
     <span class="flow">While</span>
     <template #content>
       
-      <AnyBlock :node="predicate" />
+      <AnyTask :node="predicate" />
 
       <div class="subblock">
         <template v-if="tasks && tasks.length > 0">
           <span class="flow">Do</span>
           <template v-for="n in tasks">
-            <AnyBlock :node="n" />
+            <AnyTask :node="n" />
           </template>
         </template>
       </div>
diff --git a/src/views/gamecore/blocks/DamageByAttackProperty.vue b/src/gamecore/tasks/DamageByAttackProperty.vue
similarity index 93%
rename from src/views/gamecore/blocks/DamageByAttackProperty.vue
rename to src/gamecore/tasks/DamageByAttackProperty.vue
index c3e2f24..ea6b6b2 100644
--- a/src/views/gamecore/blocks/DamageByAttackProperty.vue
+++ b/src/gamecore/tasks/DamageByAttackProperty.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-  import { GamecoreNode,
+  import { GamecoreTask,
     GamecoreTargetType, evaluateTargetType, 
     DynamicExpression, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/gamecore/tasks/DamagePerformFinish.vue b/src/gamecore/tasks/DamagePerformFinish.vue
new file mode 100644
index 0000000..bc77d1c
--- /dev/null
+++ b/src/gamecore/tasks/DamagePerformFinish.vue
@@ -0,0 +1,16 @@
+<script setup lang="ts">
+  import { GamecoreTask, 
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
+
+  defineProps<{node:GamecoreTask}>()
+</script>
+
+<template>
+  <BlockLayout :source="node">
+    Finalize Damage
+  </BlockLayout>
+</template>
+
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/gamecore/blocks/DefineDynamicValue.vue b/src/gamecore/tasks/DefineDynamicValue.vue
similarity index 73%
rename from src/views/gamecore/blocks/DefineDynamicValue.vue
rename to src/gamecore/tasks/DefineDynamicValue.vue
index b0826f0..5b30755 100644
--- a/src/views/gamecore/blocks/DefineDynamicValue.vue
+++ b/src/gamecore/tasks/DefineDynamicValue.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType,
     DynamicExpression, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/DispelStatus.vue b/src/gamecore/tasks/DispelStatus.vue
similarity index 83%
rename from src/views/gamecore/blocks/DispelStatus.vue
rename to src/gamecore/tasks/DispelStatus.vue
index facb9cb..7f857b8 100644
--- a/src/views/gamecore/blocks/DispelStatus.vue
+++ b/src/gamecore/tasks/DispelStatus.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-  import { GamecoreNode,
+  import { GamecoreTask,
     GamecoreTargetType, evaluateTargetType, 
     DynamicExpression, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/FireProjectile.vue b/src/gamecore/tasks/FireProjectile.vue
similarity index 73%
rename from src/views/gamecore/blocks/FireProjectile.vue
rename to src/gamecore/tasks/FireProjectile.vue
index b4962c4..579b6bd 100644
--- a/src/views/gamecore/blocks/FireProjectile.vue
+++ b/src/gamecore/tasks/FireProjectile.vue
@@ -1,14 +1,14 @@
 <script setup lang="ts">
-  import { GamecoreNode, GamecoreTargetType, evaluateTargetType, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
-  import AnyBlock from '@/views/gamecore/AnyBlock.vue';
+  import { GamecoreTask, GamecoreTargetType, evaluateTargetType, 
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
+  import AnyTask from '@/gamecore/AnyTask.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
-    OnProjectileHit?:GamecoreNode[]
+    OnProjectileHit?:GamecoreTask[]
     WaitProjectileFinish?:boolean
   }
   const hasOnHit = node.OnProjectileHit && node.OnProjectileHit.length > 0
@@ -28,7 +28,7 @@
         <template v-if="hasOnHit">
           <span class="flow">On Hit</span>
           <template v-for="n in node.OnProjectileHit">
-            <AnyBlock :node="n" />
+            <AnyTask :node="n" />
           </template>
         </template>
       </div>
diff --git a/src/views/gamecore/blocks/HealHP.vue b/src/gamecore/tasks/HealHP.vue
similarity index 85%
rename from src/views/gamecore/blocks/HealHP.vue
rename to src/gamecore/tasks/HealHP.vue
index ae368a1..c6aead0 100644
--- a/src/views/gamecore/blocks/HealHP.vue
+++ b/src/gamecore/tasks/HealHP.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-  import { GamecoreNode,
+  import { GamecoreTask,
     GamecoreTargetType, evaluateTargetType, 
     DynamicExpression, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/gamecore/tasks/IncludeTaskListTemplate.vue b/src/gamecore/tasks/IncludeTaskListTemplate.vue
new file mode 100644
index 0000000..5654877
--- /dev/null
+++ b/src/gamecore/tasks/IncludeTaskListTemplate.vue
@@ -0,0 +1,44 @@
+<script setup lang="ts">
+  import { Ref, inject, watch, ref } from 'vue';
+  import { ExpressionContext, GamecoreTask, 
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
+  import { TaskContext, TaskListTemplate, findTaskTemplate, } from '@/sources/ability';
+  import AnyTask from '../AnyTask.vue';
+
+  const props = defineProps<{node:GamecoreTask}>()
+  const node = props.node as unknown as 
+  {
+    Name:string
+  }
+
+  const expressionContext = inject('expressionContext') as Ref<ExpressionContext>
+  const taskContext = inject('taskContext') as Ref<TaskContext>
+
+  const taskTemplate = ref<TaskListTemplate>()
+  watch([expressionContext, taskContext], () =>
+  {
+    taskTemplate.value = findTaskTemplate(node.Name, expressionContext.value, taskContext.value)
+  },
+  { immediate:true })
+</script>
+
+<template>
+  <BlockLayout :source="node">
+    <span class="flow">
+      Include task list template 
+      <em>{{ node.Name }}</em>
+    </span>
+    <template #content v-if="taskTemplate">
+      <AnyTask v-for="task in taskTemplate.TaskList" :node="task" />
+    </template>
+    <template #content v-else>
+      <div class="subblock">
+        Not found
+      </div>
+    </template>
+  </BlockLayout>
+</template>
+
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/gamecore/blocks/InitShield.vue b/src/gamecore/tasks/InitShield.vue
similarity index 85%
rename from src/views/gamecore/blocks/InitShield.vue
rename to src/gamecore/tasks/InitShield.vue
index 84fdfd6..0cae63c 100644
--- a/src/views/gamecore/blocks/InitShield.vue
+++ b/src/gamecore/tasks/InitShield.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-  import { GamecoreNode,
+  import { GamecoreTask,
     GamecoreTargetType, evaluateTargetType, 
     DynamicExpression, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/LoopExecuteTaskList.vue b/src/gamecore/tasks/LoopExecuteTaskList.vue
similarity index 66%
rename from src/views/gamecore/blocks/LoopExecuteTaskList.vue
rename to src/gamecore/tasks/LoopExecuteTaskList.vue
index a7d5c55..ea91de4 100644
--- a/src/views/gamecore/blocks/LoopExecuteTaskList.vue
+++ b/src/gamecore/tasks/LoopExecuteTaskList.vue
@@ -1,16 +1,16 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     DynamicExpression, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
-  import AnyBlock from '@/views/gamecore/AnyBlock.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
+  import AnyTask from '@/gamecore/AnyTask.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     MaxLoopCount:DynamicExpression
-    TaskList:GamecoreNode[]
+    TaskList:GamecoreTask[]
   }
 
   const tasks = node.TaskList;
@@ -22,7 +22,7 @@
     <template #content>
       <template v-if="tasks && tasks.length > 0">
         <template v-for="n in tasks">
-          <AnyBlock :node="n" />
+          <AnyTask :node="n" />
         </template>
       </template>
     </template>
diff --git a/src/views/gamecore/blocks/LoopExecuteTaskListWithInterval.vue b/src/gamecore/tasks/LoopExecuteTaskListWithInterval.vue
similarity index 66%
rename from src/views/gamecore/blocks/LoopExecuteTaskListWithInterval.vue
rename to src/gamecore/tasks/LoopExecuteTaskListWithInterval.vue
index a7d5c55..ea91de4 100644
--- a/src/views/gamecore/blocks/LoopExecuteTaskListWithInterval.vue
+++ b/src/gamecore/tasks/LoopExecuteTaskListWithInterval.vue
@@ -1,16 +1,16 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     DynamicExpression, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
-  import AnyBlock from '@/views/gamecore/AnyBlock.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
+  import AnyTask from '@/gamecore/AnyTask.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     MaxLoopCount:DynamicExpression
-    TaskList:GamecoreNode[]
+    TaskList:GamecoreTask[]
   }
 
   const tasks = node.TaskList;
@@ -22,7 +22,7 @@
     <template #content>
       <template v-if="tasks && tasks.length > 0">
         <template v-for="n in tasks">
-          <AnyBlock :node="n" />
+          <AnyTask :node="n" />
         </template>
       </template>
     </template>
diff --git a/src/views/gamecore/blocks/LoopTargetList.vue b/src/gamecore/tasks/LoopTargetList.vue
similarity index 69%
rename from src/views/gamecore/blocks/LoopTargetList.vue
rename to src/gamecore/tasks/LoopTargetList.vue
index fd31b59..391286e 100644
--- a/src/views/gamecore/blocks/LoopTargetList.vue
+++ b/src/gamecore/tasks/LoopTargetList.vue
@@ -1,16 +1,16 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     DynamicExpression, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
-  import AnyBlock from '@/views/gamecore/AnyBlock.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
+  import AnyTask from '@/gamecore/AnyTask.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     MaxLoopCount?:DynamicExpression
-    TaskList:GamecoreNode[]
+    TaskList:GamecoreTask[]
   }
 
   const tasks = node.TaskList;
@@ -23,7 +23,7 @@
     <template #content>
       <template v-if="tasks && tasks.length > 0">
         <template v-for="n in tasks">
-          <AnyBlock :node="n" />
+          <AnyTask :node="n" />
         </template>
       </template>
     </template>
diff --git a/src/views/gamecore/blocks/LoseHPByRatio.vue b/src/gamecore/tasks/LoseHPByRatio.vue
similarity index 81%
rename from src/views/gamecore/blocks/LoseHPByRatio.vue
rename to src/gamecore/tasks/LoseHPByRatio.vue
index f8b6223..f5f33b3 100644
--- a/src/views/gamecore/blocks/LoseHPByRatio.vue
+++ b/src/gamecore/tasks/LoseHPByRatio.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-  import { GamecoreNode,
+  import { GamecoreTask,
     GamecoreTargetType, evaluateTargetType, 
     DynamicExpression, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/MakeCharacterHUDVisible.vue b/src/gamecore/tasks/MakeCharacterHUDVisible.vue
similarity index 72%
rename from src/views/gamecore/blocks/MakeCharacterHUDVisible.vue
rename to src/gamecore/tasks/MakeCharacterHUDVisible.vue
index 45a80b6..b9e933f 100644
--- a/src/views/gamecore/blocks/MakeCharacterHUDVisible.vue
+++ b/src/gamecore/tasks/MakeCharacterHUDVisible.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType, evaluateTargetType, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/gamecore/tasks/MakeSuccess.vue b/src/gamecore/tasks/MakeSuccess.vue
new file mode 100644
index 0000000..5e91a85
--- /dev/null
+++ b/src/gamecore/tasks/MakeSuccess.vue
@@ -0,0 +1,25 @@
+<script setup lang="ts">
+  import { GamecoreTask, 
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
+  import AnyTask from '@/gamecore/AnyTask.vue';
+
+  const props = defineProps<{node:GamecoreTask}>()
+  const node = props.node as unknown as 
+  {
+    Task:GamecoreTask
+  }
+
+</script>
+
+<template>
+  <BlockLayout :source="node" :cosmetic="true">
+    <span class="flow">Make success(?)</span>
+    <template #content>
+      <AnyTask :node="node.Task" />
+    </template>
+  </BlockLayout>
+</template>
+
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/gamecore/blocks/ModifierAttachEffect.vue b/src/gamecore/tasks/ModifierAttachEffect.vue
similarity index 67%
rename from src/views/gamecore/blocks/ModifierAttachEffect.vue
rename to src/gamecore/tasks/ModifierAttachEffect.vue
index 951f46b..d793c60 100644
--- a/src/views/gamecore/blocks/ModifierAttachEffect.vue
+++ b/src/gamecore/tasks/ModifierAttachEffect.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType, evaluateTargetType, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/ModifyActionDelay.vue b/src/gamecore/tasks/ModifyActionDelay.vue
similarity index 79%
rename from src/views/gamecore/blocks/ModifyActionDelay.vue
rename to src/gamecore/tasks/ModifyActionDelay.vue
index 21894a1..67b4d55 100644
--- a/src/views/gamecore/blocks/ModifyActionDelay.vue
+++ b/src/gamecore/tasks/ModifyActionDelay.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-  import { GamecoreNode,
+  import { GamecoreTask,
     GamecoreTargetType, evaluateTargetType, 
     DynamicExpression, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/ModifyCurrentSkillDelayCost.vue b/src/gamecore/tasks/ModifyCurrentSkillDelayCost.vue
similarity index 79%
rename from src/views/gamecore/blocks/ModifyCurrentSkillDelayCost.vue
rename to src/gamecore/tasks/ModifyCurrentSkillDelayCost.vue
index a0b4fab..9424634 100644
--- a/src/views/gamecore/blocks/ModifyCurrentSkillDelayCost.vue
+++ b/src/gamecore/tasks/ModifyCurrentSkillDelayCost.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-  import { GamecoreNode,
+  import { GamecoreTask,
     GamecoreTargetType, 
     DynamicExpression, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/ModifyDamageData.vue b/src/gamecore/tasks/ModifyDamageData.vue
similarity index 75%
rename from src/views/gamecore/blocks/ModifyDamageData.vue
rename to src/gamecore/tasks/ModifyDamageData.vue
index 47a5107..7743551 100644
--- a/src/views/gamecore/blocks/ModifyDamageData.vue
+++ b/src/gamecore/tasks/ModifyDamageData.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-  import { getHash } from '@/scripts/translate';
-  import { GamecoreNode, 
+  import { getHash } from '@/common/translate';
+  import { GamecoreTask, 
     DynamicExpression, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     [key:string]:DynamicExpression
diff --git a/src/views/gamecore/blocks/ModifyHealData.vue b/src/gamecore/tasks/ModifyHealData.vue
similarity index 75%
rename from src/views/gamecore/blocks/ModifyHealData.vue
rename to src/gamecore/tasks/ModifyHealData.vue
index 47a5107..7743551 100644
--- a/src/views/gamecore/blocks/ModifyHealData.vue
+++ b/src/gamecore/tasks/ModifyHealData.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-  import { getHash } from '@/scripts/translate';
-  import { GamecoreNode, 
+  import { getHash } from '@/common/translate';
+  import { GamecoreTask, 
     DynamicExpression, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     [key:string]:DynamicExpression
diff --git a/src/views/gamecore/blocks/ModifySPNew.vue b/src/gamecore/tasks/ModifySPNew.vue
similarity index 89%
rename from src/views/gamecore/blocks/ModifySPNew.vue
rename to src/gamecore/tasks/ModifySPNew.vue
index 689c82d..b669451 100644
--- a/src/views/gamecore/blocks/ModifySPNew.vue
+++ b/src/gamecore/tasks/ModifySPNew.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType, evaluateTargetType, 
     DynamicExpression, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/ModifyTeamBoostPoint.vue b/src/gamecore/tasks/ModifyTeamBoostPoint.vue
similarity index 73%
rename from src/views/gamecore/blocks/ModifyTeamBoostPoint.vue
rename to src/gamecore/tasks/ModifyTeamBoostPoint.vue
index b0b9b30..8c73ac0 100644
--- a/src/views/gamecore/blocks/ModifyTeamBoostPoint.vue
+++ b/src/gamecore/tasks/ModifyTeamBoostPoint.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-  import { GamecoreNode,
+  import { GamecoreTask,
     GamecoreTargetType, 
     DynamicExpression, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/PredicateTaskList.vue b/src/gamecore/tasks/PredicateTaskList.vue
similarity index 65%
rename from src/views/gamecore/blocks/PredicateTaskList.vue
rename to src/gamecore/tasks/PredicateTaskList.vue
index a6d1efa..fe87295 100644
--- a/src/views/gamecore/blocks/PredicateTaskList.vue
+++ b/src/gamecore/tasks/PredicateTaskList.vue
@@ -1,15 +1,15 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
-  import AnyBlock from '@/views/gamecore/AnyBlock.vue';
+  import { GamecoreTask, 
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
+  import AnyTask from '@/gamecore/AnyTask.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
-    Predicate:GamecoreNode
-    SuccessTaskList:GamecoreNode[]
-    FailedTaskList:GamecoreNode[]
+    Predicate:GamecoreTask
+    SuccessTaskList:GamecoreTask[]
+    FailedTaskList:GamecoreTask[]
   }
 
   const predicate = node.Predicate;
@@ -22,20 +22,20 @@
     <span class="flow">If</span>
     <template #content>
       
-      <AnyBlock :node="predicate" />
+      <AnyTask :node="predicate" />
 
       <div class="subblock">
         <template v-if="successTasks && successTasks.length > 0">
           <span class="flow">Then</span>
           <template v-for="n in successTasks">
-            <AnyBlock :node="n" />
+            <AnyTask :node="n" />
           </template>
         </template>
 
         <template v-if="failedTasks && failedTasks.length > 0">
           <span class="flow">Else</span>
           <template v-for="n in failedTasks">
-            <AnyBlock :node="n" />
+            <AnyTask :node="n" />
           </template>
         </template>
       </div>
diff --git a/src/views/gamecore/blocks/RandomConfig.vue b/src/gamecore/tasks/RandomConfig.vue
similarity index 66%
rename from src/views/gamecore/blocks/RandomConfig.vue
rename to src/gamecore/tasks/RandomConfig.vue
index 4871423..2509cf6 100644
--- a/src/views/gamecore/blocks/RandomConfig.vue
+++ b/src/gamecore/tasks/RandomConfig.vue
@@ -1,16 +1,16 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     DynamicExpression, 
-  } from '@/scripts/sources/gamecore';
-  import AnyBlock from '../AnyBlock.vue';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import AnyTask from '../AnyTask.vue';
+  import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     OddsList:DynamicExpression[]
-    TaskList:GamecoreNode[]
+    TaskList:GamecoreTask[]
   }
 </script>
 
@@ -20,7 +20,7 @@
     <template #content>
       <template v-for="task, index in node.TaskList">
         <span class="flow"><em><EvaluateExpression :expression="node.OddsList[index]" /></em>×</span>
-        <AnyBlock :node="task" />
+        <AnyTask :node="task" />
       </template>
     </template>
   </BlockLayout>
diff --git a/src/views/gamecore/blocks/RemoveEffect.vue b/src/gamecore/tasks/RemoveEffect.vue
similarity index 67%
rename from src/views/gamecore/blocks/RemoveEffect.vue
rename to src/gamecore/tasks/RemoveEffect.vue
index 152b06d..aaf9644 100644
--- a/src/views/gamecore/blocks/RemoveEffect.vue
+++ b/src/gamecore/tasks/RemoveEffect.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType, evaluateTargetType, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/RemoveModifier.vue b/src/gamecore/tasks/RemoveModifier.vue
similarity index 82%
rename from src/views/gamecore/blocks/RemoveModifier.vue
rename to src/gamecore/tasks/RemoveModifier.vue
index cec0e6a..24c07b5 100644
--- a/src/views/gamecore/blocks/RemoveModifier.vue
+++ b/src/gamecore/tasks/RemoveModifier.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
   import { inject } from 'vue';
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType, evaluateTargetType, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/gamecore/tasks/RemoveSelfModifier.vue b/src/gamecore/tasks/RemoveSelfModifier.vue
new file mode 100644
index 0000000..596486e
--- /dev/null
+++ b/src/gamecore/tasks/RemoveSelfModifier.vue
@@ -0,0 +1,16 @@
+<script setup lang="ts">
+  import { GamecoreTask,
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
+
+  defineProps<{node:GamecoreTask}>()
+</script>
+
+<template>
+  <BlockLayout :source="node">
+    Remove this modifier
+  </BlockLayout>
+</template>
+
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/gamecore/blocks/RemoveShield.vue b/src/gamecore/tasks/RemoveShield.vue
similarity index 69%
rename from src/views/gamecore/blocks/RemoveShield.vue
rename to src/gamecore/tasks/RemoveShield.vue
index 5c39a4d..0e87e9a 100644
--- a/src/views/gamecore/blocks/RemoveShield.vue
+++ b/src/gamecore/tasks/RemoveShield.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-  import { GamecoreNode,
+  import { GamecoreTask,
     GamecoreTargetType, evaluateTargetType, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/Retarget.vue b/src/gamecore/tasks/Retarget.vue
similarity index 77%
rename from src/views/gamecore/blocks/Retarget.vue
rename to src/gamecore/tasks/Retarget.vue
index d219dde..1be71e6 100644
--- a/src/views/gamecore/blocks/Retarget.vue
+++ b/src/gamecore/tasks/Retarget.vue
@@ -1,20 +1,20 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType, evaluateTargetType, 
     DynamicExpression, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
-  import AnyBlock from '@/views/gamecore/AnyBlock.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
+  import AnyTask from '@/gamecore/AnyTask.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType:GamecoreTargetType
     MaxNumber?:DynamicExpression
-    Predicate?:GamecoreNode
+    Predicate?:GamecoreTask
     IncludeLimbo:boolean
-    TaskList?:GamecoreNode[]
+    TaskList?:GamecoreTask[]
   }
 
   const tasks = node.TaskList;
@@ -44,12 +44,12 @@
       <div class="subblock">
         <template v-if="node.Predicate">
           <span class="flow">With Condition</span>
-          <AnyBlock :node="node.Predicate" />
+          <AnyTask :node="node.Predicate" />
         </template>
         <template v-if="tasks && tasks.length > 0">
           <span class="flow">Do</span>
           <template v-for="n in tasks">
-            <AnyBlock :node="n" />
+            <AnyTask :node="n" />
           </template>
         </template>
       </div>
diff --git a/src/views/gamecore/blocks/SetActionDelay.vue b/src/gamecore/tasks/SetActionDelay.vue
similarity index 82%
rename from src/views/gamecore/blocks/SetActionDelay.vue
rename to src/gamecore/tasks/SetActionDelay.vue
index 526eb74..1a276af 100644
--- a/src/views/gamecore/blocks/SetActionDelay.vue
+++ b/src/gamecore/tasks/SetActionDelay.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-  import { GamecoreNode,
+  import { GamecoreTask,
     GamecoreTargetType, evaluateTargetType, 
     DynamicExpression, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/SetDynamicValue.vue b/src/gamecore/tasks/SetDynamicValue.vue
similarity index 70%
rename from src/views/gamecore/blocks/SetDynamicValue.vue
rename to src/gamecore/tasks/SetDynamicValue.vue
index e392436..9cd075c 100644
--- a/src/views/gamecore/blocks/SetDynamicValue.vue
+++ b/src/gamecore/tasks/SetDynamicValue.vue
@@ -1,13 +1,13 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType,
     DynamicExpression, 
-  } from '@/scripts/sources/gamecore';
-  import useHashStore from '@/scripts/hashstore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import useHashStore from '@/common/hashstore';
+  import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/SetDynamicValueByAddValue.vue b/src/gamecore/tasks/SetDynamicValueByAddValue.vue
similarity index 79%
rename from src/views/gamecore/blocks/SetDynamicValueByAddValue.vue
rename to src/gamecore/tasks/SetDynamicValueByAddValue.vue
index 0ad3e7d..20d392f 100644
--- a/src/views/gamecore/blocks/SetDynamicValueByAddValue.vue
+++ b/src/gamecore/tasks/SetDynamicValueByAddValue.vue
@@ -1,13 +1,13 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType, evaluateTargetType, 
     DynamicExpression,
-  } from '@/scripts/sources/gamecore';
-  import useHashStore from '@/scripts/hashstore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import useHashStore from '@/common/hashstore';
+  import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/SetDynamicValueByBreakBaseDamage.vue b/src/gamecore/tasks/SetDynamicValueByBreakBaseDamage.vue
similarity index 70%
rename from src/views/gamecore/blocks/SetDynamicValueByBreakBaseDamage.vue
rename to src/gamecore/tasks/SetDynamicValueByBreakBaseDamage.vue
index 3034d87..f62fc14 100644
--- a/src/views/gamecore/blocks/SetDynamicValueByBreakBaseDamage.vue
+++ b/src/gamecore/tasks/SetDynamicValueByBreakBaseDamage.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType, evaluateTargetType, 
-  } from '@/scripts/sources/gamecore';
-  import useHashStore from '@/scripts/hashstore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import useHashStore from '@/common/hashstore';
+  import BlockLayout from '@/components/BlockLayout.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     ReadTargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/SetDynamicValueByHPRatio.vue b/src/gamecore/tasks/SetDynamicValueByHPRatio.vue
similarity index 70%
rename from src/views/gamecore/blocks/SetDynamicValueByHPRatio.vue
rename to src/gamecore/tasks/SetDynamicValueByHPRatio.vue
index cd775e1..2ce3da1 100644
--- a/src/views/gamecore/blocks/SetDynamicValueByHPRatio.vue
+++ b/src/gamecore/tasks/SetDynamicValueByHPRatio.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType, evaluateTargetType, 
-  } from '@/scripts/sources/gamecore';
-  import useHashStore from '@/scripts/hashstore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import useHashStore from '@/common/hashstore';
+  import BlockLayout from '@/components/BlockLayout.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     ReadTargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/SetDynamicValueByHealDataProperty.vue b/src/gamecore/tasks/SetDynamicValueByHealDataProperty.vue
similarity index 73%
rename from src/views/gamecore/blocks/SetDynamicValueByHealDataProperty.vue
rename to src/gamecore/tasks/SetDynamicValueByHealDataProperty.vue
index 8f13d5d..dac616c 100644
--- a/src/views/gamecore/blocks/SetDynamicValueByHealDataProperty.vue
+++ b/src/gamecore/tasks/SetDynamicValueByHealDataProperty.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType, evaluateTargetType, 
-  } from '@/scripts/sources/gamecore';
-  import useHashStore from '@/scripts/hashstore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import useHashStore from '@/common/hashstore';
+  import BlockLayout from '@/components/BlockLayout.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     ReadTargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/SetDynamicValueByModifierValue.vue b/src/gamecore/tasks/SetDynamicValueByModifierValue.vue
similarity index 83%
rename from src/views/gamecore/blocks/SetDynamicValueByModifierValue.vue
rename to src/gamecore/tasks/SetDynamicValueByModifierValue.vue
index c4834d5..58e5889 100644
--- a/src/views/gamecore/blocks/SetDynamicValueByModifierValue.vue
+++ b/src/gamecore/tasks/SetDynamicValueByModifierValue.vue
@@ -1,14 +1,14 @@
 <script setup lang="ts">
   import { inject } from 'vue';
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType, evaluateTargetType, 
     DynamicExpression,
-  } from '@/scripts/sources/gamecore';
-  import useHashStore from '@/scripts/hashstore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import useHashStore from '@/common/hashstore';
+  import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     ReadTargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/SetDynamicValueByProperty.vue b/src/gamecore/tasks/SetDynamicValueByProperty.vue
similarity index 72%
rename from src/views/gamecore/blocks/SetDynamicValueByProperty.vue
rename to src/gamecore/tasks/SetDynamicValueByProperty.vue
index 8307199..9fc3cb6 100644
--- a/src/views/gamecore/blocks/SetDynamicValueByProperty.vue
+++ b/src/gamecore/tasks/SetDynamicValueByProperty.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType, evaluateTargetType, 
-  } from '@/scripts/sources/gamecore';
-  import useHashStore from '@/scripts/hashstore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import useHashStore from '@/common/hashstore';
+  import BlockLayout from '@/components/BlockLayout.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     ReadTargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/SetDynamicValueByStatusCount.vue b/src/gamecore/tasks/SetDynamicValueByStatusCount.vue
similarity index 71%
rename from src/views/gamecore/blocks/SetDynamicValueByStatusCount.vue
rename to src/gamecore/tasks/SetDynamicValueByStatusCount.vue
index b871ef9..489e0e8 100644
--- a/src/views/gamecore/blocks/SetDynamicValueByStatusCount.vue
+++ b/src/gamecore/tasks/SetDynamicValueByStatusCount.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType, evaluateTargetType, 
-  } from '@/scripts/sources/gamecore';
-  import useHashStore from '@/scripts/hashstore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import useHashStore from '@/common/hashstore';
+  import BlockLayout from '@/components/BlockLayout.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     ReadTargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/SetDynamicValueByVariateType.vue b/src/gamecore/tasks/SetDynamicValueByVariateType.vue
similarity index 65%
rename from src/views/gamecore/blocks/SetDynamicValueByVariateType.vue
rename to src/gamecore/tasks/SetDynamicValueByVariateType.vue
index 9c67fe8..4243350 100644
--- a/src/views/gamecore/blocks/SetDynamicValueByVariateType.vue
+++ b/src/gamecore/tasks/SetDynamicValueByVariateType.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType,
-  } from '@/scripts/sources/gamecore';
-  import useHashStore from '@/scripts/hashstore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import useHashStore from '@/common/hashstore';
+  import BlockLayout from '@/components/BlockLayout.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/SetEnergyBarState.vue b/src/gamecore/tasks/SetEnergyBarState.vue
similarity index 88%
rename from src/views/gamecore/blocks/SetEnergyBarState.vue
rename to src/gamecore/tasks/SetEnergyBarState.vue
index 79a4ae0..285bf1e 100644
--- a/src/views/gamecore/blocks/SetEnergyBarState.vue
+++ b/src/gamecore/tasks/SetEnergyBarState.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType, evaluateTargetType, 
     DynamicExpression, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/SetHP.vue b/src/gamecore/tasks/SetHP.vue
similarity index 78%
rename from src/views/gamecore/blocks/SetHP.vue
rename to src/gamecore/tasks/SetHP.vue
index 55605ba..5620192 100644
--- a/src/views/gamecore/blocks/SetHP.vue
+++ b/src/gamecore/tasks/SetHP.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-  import { GamecoreNode,
+  import { GamecoreTask,
     GamecoreTargetType, evaluateTargetType, 
     DynamicExpression, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/SetModifierValue.vue b/src/gamecore/tasks/SetModifierValue.vue
similarity index 89%
rename from src/views/gamecore/blocks/SetModifierValue.vue
rename to src/gamecore/tasks/SetModifierValue.vue
index 659dc9e..708da4f 100644
--- a/src/views/gamecore/blocks/SetModifierValue.vue
+++ b/src/gamecore/tasks/SetModifierValue.vue
@@ -1,13 +1,13 @@
 <script setup lang="ts">
   import { inject } from 'vue';
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType, evaluateTargetType, 
     DynamicExpression,
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/ShowAttackTime.vue b/src/gamecore/tasks/ShowAttackTime.vue
similarity index 84%
rename from src/views/gamecore/blocks/ShowAttackTime.vue
rename to src/gamecore/tasks/ShowAttackTime.vue
index 7246e52..1283194 100644
--- a/src/views/gamecore/blocks/ShowAttackTime.vue
+++ b/src/gamecore/tasks/ShowAttackTime.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType, evaluateTargetType, 
     DynamicExpression, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/ShowEntityFloatMessage.vue b/src/gamecore/tasks/ShowEntityFloatMessage.vue
similarity index 71%
rename from src/views/gamecore/blocks/ShowEntityFloatMessage.vue
rename to src/gamecore/tasks/ShowEntityFloatMessage.vue
index a7ba748..ebe08b9 100644
--- a/src/views/gamecore/blocks/ShowEntityFloatMessage.vue
+++ b/src/gamecore/tasks/ShowEntityFloatMessage.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
   import { inject, } from 'vue';
-  import { GamecoreNode,
+  import { GamecoreTask,
     GamecoreTargetType, evaluateTargetType, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
-import translate, { Translatable } from '@/scripts/translate';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
+import translate, { Translatable } from '@/common/translate';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/gamecore/tasks/SkillExecutionStart.vue b/src/gamecore/tasks/SkillExecutionStart.vue
new file mode 100644
index 0000000..15964bc
--- /dev/null
+++ b/src/gamecore/tasks/SkillExecutionStart.vue
@@ -0,0 +1,16 @@
+<script setup lang="ts">
+  import { GamecoreTask, 
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
+
+  defineProps<{node:GamecoreTask}>()
+</script>
+
+<template>
+  <BlockLayout :source="node">
+    Begin Skill
+  </BlockLayout>
+</template>
+
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/src/gamecore/tasks/SkillPerformFinish.vue b/src/gamecore/tasks/SkillPerformFinish.vue
new file mode 100644
index 0000000..b0d40e9
--- /dev/null
+++ b/src/gamecore/tasks/SkillPerformFinish.vue
@@ -0,0 +1,16 @@
+<script setup lang="ts">
+  import { GamecoreTask, 
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
+
+  defineProps<{node:GamecoreTask}>()
+</script>
+
+<template>
+  <BlockLayout :source="node">
+    Finalize Skill
+  </BlockLayout>
+</template>
+
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/gamecore/blocks/StackProperty.vue b/src/gamecore/tasks/StackProperty.vue
similarity index 81%
rename from src/views/gamecore/blocks/StackProperty.vue
rename to src/gamecore/tasks/StackProperty.vue
index 2501ce8..6d12806 100644
--- a/src/views/gamecore/blocks/StackProperty.vue
+++ b/src/gamecore/tasks/StackProperty.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType, evaluateTargetType, 
     DynamicExpression, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/StackStatusResistance.vue b/src/gamecore/tasks/StackStatusResistance.vue
similarity index 78%
rename from src/views/gamecore/blocks/StackStatusResistance.vue
rename to src/gamecore/tasks/StackStatusResistance.vue
index 528275e..33a15dc 100644
--- a/src/views/gamecore/blocks/StackStatusResistance.vue
+++ b/src/gamecore/tasks/StackStatusResistance.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-  import { GamecoreNode,
+  import { GamecoreTask,
     GamecoreTargetType, evaluateTargetType, 
     DynamicExpression, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/TriggerAbility.vue b/src/gamecore/tasks/TriggerAbility.vue
similarity index 83%
rename from src/views/gamecore/blocks/TriggerAbility.vue
rename to src/gamecore/tasks/TriggerAbility.vue
index bd66259..0607908 100644
--- a/src/views/gamecore/blocks/TriggerAbility.vue
+++ b/src/gamecore/tasks/TriggerAbility.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
   import { inject } from 'vue';
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType, evaluateTargetType, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/TriggerEffect.vue b/src/gamecore/tasks/TriggerEffect.vue
similarity index 67%
rename from src/views/gamecore/blocks/TriggerEffect.vue
rename to src/gamecore/tasks/TriggerEffect.vue
index 83b8f32..a35fa5c 100644
--- a/src/views/gamecore/blocks/TriggerEffect.vue
+++ b/src/gamecore/tasks/TriggerEffect.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType, evaluateTargetType, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/TriggerEffectList.vue b/src/gamecore/tasks/TriggerEffectList.vue
similarity index 67%
rename from src/views/gamecore/blocks/TriggerEffectList.vue
rename to src/gamecore/tasks/TriggerEffectList.vue
index c41bbd8..34aa655 100644
--- a/src/views/gamecore/blocks/TriggerEffectList.vue
+++ b/src/gamecore/tasks/TriggerEffectList.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType, evaluateTargetType, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/TriggerEnergyBarEffect.vue b/src/gamecore/tasks/TriggerEnergyBarEffect.vue
similarity index 71%
rename from src/views/gamecore/blocks/TriggerEnergyBarEffect.vue
rename to src/gamecore/tasks/TriggerEnergyBarEffect.vue
index 43b5b8e..05177ea 100644
--- a/src/views/gamecore/blocks/TriggerEnergyBarEffect.vue
+++ b/src/gamecore/tasks/TriggerEnergyBarEffect.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType, evaluateTargetType, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/TriggerModifierCustomEvent.vue b/src/gamecore/tasks/TriggerModifierCustomEvent.vue
similarity index 83%
rename from src/views/gamecore/blocks/TriggerModifierCustomEvent.vue
rename to src/gamecore/tasks/TriggerModifierCustomEvent.vue
index 57bf387..ef608fc 100644
--- a/src/views/gamecore/blocks/TriggerModifierCustomEvent.vue
+++ b/src/gamecore/tasks/TriggerModifierCustomEvent.vue
@@ -1,13 +1,13 @@
 <script setup lang="ts">
-  import { GamecoreNode,
+  import { GamecoreTask,
     GamecoreTargetType, evaluateTargetType, 
     DynamicExpression, 
-  } from '@/scripts/sources/gamecore';
-  import useHashStore from '@/scripts/hashstore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import useHashStore from '@/common/hashstore';
+  import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/TurnInsertAbility.vue b/src/gamecore/tasks/TurnInsertAbility.vue
similarity index 85%
rename from src/views/gamecore/blocks/TurnInsertAbility.vue
rename to src/gamecore/tasks/TurnInsertAbility.vue
index daf040e..ffce158 100644
--- a/src/views/gamecore/blocks/TurnInsertAbility.vue
+++ b/src/gamecore/tasks/TurnInsertAbility.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
   import { inject } from 'vue';
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType, evaluateTargetType, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/TurnInsertAction.vue b/src/gamecore/tasks/TurnInsertAction.vue
similarity index 85%
rename from src/views/gamecore/blocks/TurnInsertAction.vue
rename to src/gamecore/tasks/TurnInsertAction.vue
index 9916259..f22b5cb 100644
--- a/src/views/gamecore/blocks/TurnInsertAction.vue
+++ b/src/gamecore/tasks/TurnInsertAction.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
   import { inject } from 'vue';
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType, evaluateTargetType, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/WaitAnimState.vue b/src/gamecore/tasks/WaitAnimState.vue
similarity index 83%
rename from src/views/gamecore/blocks/WaitAnimState.vue
rename to src/gamecore/tasks/WaitAnimState.vue
index 2cee109..f4bfaec 100644
--- a/src/views/gamecore/blocks/WaitAnimState.vue
+++ b/src/gamecore/tasks/WaitAnimState.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-  import { GamecoreNode, 
+  import { GamecoreTask, 
     GamecoreTargetType, evaluateTargetType, 
     DynamicExpression, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     TargetType?:GamecoreTargetType
diff --git a/src/views/gamecore/blocks/WaitSecond.vue b/src/gamecore/tasks/WaitSecond.vue
similarity index 60%
rename from src/views/gamecore/blocks/WaitSecond.vue
rename to src/gamecore/tasks/WaitSecond.vue
index d93d0e2..79f6017 100644
--- a/src/views/gamecore/blocks/WaitSecond.vue
+++ b/src/gamecore/tasks/WaitSecond.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-  import { GamecoreNode, } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
+  import { GamecoreTask, } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
 
-  const props = defineProps<{node:GamecoreNode}>()
+  const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     WaitTime:number
diff --git a/src/main.ts b/src/main.ts
index 58c98a2..a9d2d78 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -3,7 +3,7 @@ import './style.css'
 // Routes
 
 import { createRouter, createWebHashHistory, RouteRecordRaw } from 'vue-router'
-import { toRouteProps } from './scripts/common'
+import { toRouteProps } from './common/common'
 
 import Title from './views/Title.vue'
 import Commit from './views/Commit.vue'
diff --git a/src/scripts/sources/ability.ts b/src/sources/ability.ts
similarity index 84%
rename from src/scripts/sources/ability.ts
rename to src/sources/ability.ts
index b895a55..12bfc37 100644
--- a/src/scripts/sources/ability.ts
+++ b/src/sources/ability.ts
@@ -1,17 +1,17 @@
-import { retrieveJson } from '../datasource';
-import { MutexGroup } from '../mutex';
-import { GamecoreContext, GamecoreNode, GamecoreTargetType, DynamicExpression, DynamicValues, } from './gamecore';
+import { retrieveJson } from '@/common/datasource';
+import { MutexGroup } from '@/common/mutex';
+import { ExpressionContext, GamecoreTask, GamecoreTargetType, DynamicExpression, DynamicValues, } from './gamecore';
 
 export interface ModifierEventHandler
 {
-  CallbackConfig: GamecoreNode[]
+  CallbackConfig: GamecoreTask[]
 }
 
 export interface ModifierPreshowConfig
 {
   SkillTypes: string[]
   TargetType: GamecoreTargetType
-  Condition: GamecoreNode
+  Condition: GamecoreTask
   ActionDelayPreshowConfig:
   {
     [property:string]: DynamicExpression
@@ -23,9 +23,9 @@ export interface RangeWatcher
   Min?:DynamicExpression
   Max?:DynamicExpression
   MaxInclusive?:boolean
-  OnEnterRange?: GamecoreNode[]
-  OnExitRange?: GamecoreNode[]
-  OnChange?: GamecoreNode[]
+  OnEnterRange?: GamecoreTask[]
+  OnExitRange?: GamecoreTask[]
+  OnChange?: GamecoreTask[]
 }
 
 export interface PropertyChangeWatcher
@@ -46,7 +46,7 @@ export interface ValueChangeWatcher
 export interface TaskListTemplate
 {
   Name:string
-  TaskList:GamecoreNode[]
+  TaskList:GamecoreTask[]
 }
 
 export interface Modifier
@@ -86,9 +86,9 @@ export interface Ability
     TargetType:string
     MaxTargetCount?:number
   }
-  OnAdd?: GamecoreNode[]
-  OnRemove?: GamecoreNode[]
-  OnStart?: GamecoreNode[]
+  OnAdd?: GamecoreTask[]
+  OnRemove?: GamecoreTask[]
+  OnStart?: GamecoreTask[]
   DynamicValues?: DynamicValues
   Modifiers?:
   {
@@ -119,7 +119,7 @@ export interface TaskListTemplateConfig
   TaskListTemplate: TaskListTemplate[]
 }
 
-export interface AbilityContext
+export interface TaskContext
 {
   Abilities: 
   {
@@ -135,7 +135,7 @@ export interface AbilityContext
   }
 }
 
-export enum AbilityContextType
+export enum TaskContextType
 {
   All = 'All',
   Avatar = 'Avatar',
@@ -302,21 +302,21 @@ const contextTypeToPaths =
   },
 }
 
-const abilityContextCache:{[commitId: string]: {[type: string]: AbilityContext}} = {}
-const abilityContextMutex = new MutexGroup()
-export async function getAbilityContext(commitId:string, type:AbilityContextType) : Promise<AbilityContext>
+const taskContextCache:{[commitId: string]: {[type: string]: TaskContext}} = {}
+const taskContextMutex = new MutexGroup()
+export async function getTaskContext(commitId:string, type:TaskContextType) : Promise<TaskContext>
 {
-  return abilityContextMutex.runExclusive(type, async () => 
+  return taskContextMutex.runExclusive(type, async () => 
   {
     let result 
-    let container = abilityContextCache[commitId]
+    let container = taskContextCache[commitId]
     if (container === undefined)
-      container = abilityContextCache[commitId] = {}
+      container = taskContextCache[commitId] = {}
     else result = container[type]
   
     if (result == undefined)
     {
-      const context:AbilityContext = 
+      const context:TaskContext = 
       {
         Abilities: {},
         Modifiers: {},
@@ -349,21 +349,21 @@ export async function getAbilityContext(commitId:string, type:AbilityContextType
   })
 }
 
-export function findTaskTemplate(templateName:string, gamecoreContext:GamecoreContext, abilityContext:AbilityContext) : TaskListTemplate | undefined
+export function findTaskTemplate(templateName:string, expressionContext:ExpressionContext, taskContext:TaskContext) : TaskListTemplate | undefined
 {
-  let template:TaskListTemplate | undefined = abilityContext.TaskListTemplates[templateName]
-  if (!template && gamecoreContext.ModifierId)
+  let template:TaskListTemplate | undefined = taskContext.TaskListTemplates[templateName]
+  if (!template && expressionContext.ModifierId)
   {
-    const modifier = abilityContext.Modifiers[gamecoreContext.ModifierId]
+    const modifier = taskContext.Modifiers[expressionContext.ModifierId]
     template = modifier?.TaskListTemplate?.find(t => t.Name == templateName)
   }
-  if (!template && gamecoreContext.AbilityId)
+  if (!template && expressionContext.AbilityId)
   {
-    const ability = abilityContext.Abilities[gamecoreContext.AbilityId]
+    const ability = taskContext.Abilities[expressionContext.AbilityId]
     template = ability?.TaskListTemplate?.find(t => t.Name == templateName)
-    if (!template && gamecoreContext.ModifierId && ability.Modifiers)
+    if (!template && expressionContext.ModifierId && ability.Modifiers)
     {
-      const modifier = ability.Modifiers[gamecoreContext.ModifierId]
+      const modifier = ability.Modifiers[expressionContext.ModifierId]
       template = modifier?.TaskListTemplate?.find(t => t.Name == templateName)
     }
   }
@@ -388,7 +388,7 @@ async function getTaskListTemplates(commitId:string, path:string) : Promise<Task
   return result
 }
 
-function mergeAbilityConfig(into:AbilityContext, from:AbilityConfig)
+function mergeAbilityConfig(into:TaskContext, from:AbilityConfig)
 {
   for (const ability of from.AbilityList)
     into.Abilities[ability.Name] = ability
@@ -396,12 +396,12 @@ function mergeAbilityConfig(into:AbilityContext, from:AbilityConfig)
     Object.assign(into.Modifiers, from.GlobalModifiers)
 }
 
-function mergeModifierConfig(into:AbilityContext, from:ModifierConfig)
+function mergeModifierConfig(into:TaskContext, from:ModifierConfig)
 {
   Object.assign(into.Modifiers, from.ModifierMap)
 }
 
-function mergeTaskListTemplateConfig(into:AbilityContext, from:TaskListTemplateConfig)
+function mergeTaskListTemplateConfig(into:TaskContext, from:TaskListTemplateConfig)
 {
   for (const template of from.TaskListTemplate)
     into.TaskListTemplates[template.Name] = template
diff --git a/src/scripts/sources/avatar.ts b/src/sources/avatar.ts
similarity index 95%
rename from src/scripts/sources/avatar.ts
rename to src/sources/avatar.ts
index f312d16..1df0166 100644
--- a/src/scripts/sources/avatar.ts
+++ b/src/sources/avatar.ts
@@ -1,9 +1,9 @@
-import { retrieveJson } from '../datasource';
-import translate, { Translatable, } from '../translate';
+import { retrieveJson } from '@/common/datasource';
+import translate, { Translatable, } from '@/common/translate';
 import { GamecoreParam } from './gamecore';
 import { Creature } from './creature';
-import { cleanupFilename } from '../common';
-import { Mutex } from '../mutex';
+import { cleanupFilename } from '@/common/common';
+import { Mutex } from '@/common/mutex';
 
 // Eidolons
 
diff --git a/src/scripts/sources/avatarskill.ts b/src/sources/avatarskill.ts
similarity index 95%
rename from src/scripts/sources/avatarskill.ts
rename to src/sources/avatarskill.ts
index 67133e6..b7069a6 100644
--- a/src/scripts/sources/avatarskill.ts
+++ b/src/sources/avatarskill.ts
@@ -1,6 +1,6 @@
-import { retrieveJson } from '../datasource';
-import { Mutex } from '../mutex';
-import translate from '../translate';
+import { retrieveJson } from '@/common/datasource';
+import { Mutex } from '@/common/mutex';
+import translate from '@/common/translate';
 import { CreatureSkill } from './skill';
 
 export interface AvatarSkill extends CreatureSkill
diff --git a/src/scripts/sources/character.ts b/src/sources/character.ts
similarity index 96%
rename from src/scripts/sources/character.ts
rename to src/sources/character.ts
index ade20b4..9e81b43 100644
--- a/src/scripts/sources/character.ts
+++ b/src/sources/character.ts
@@ -1,4 +1,4 @@
-import { retrieveJson } from '../datasource';
+import { retrieveJson } from '@/common/datasource';
 import { Avatar } from './avatar';
 import { Monster } from './monster';
 import { DynamicValues } from './gamecore';
diff --git a/src/scripts/sources/creature.ts b/src/sources/creature.ts
similarity index 100%
rename from src/scripts/sources/creature.ts
rename to src/sources/creature.ts
diff --git a/src/scripts/sources/equipment.ts b/src/sources/equipment.ts
similarity index 94%
rename from src/scripts/sources/equipment.ts
rename to src/sources/equipment.ts
index 17f699e..c650dbb 100644
--- a/src/scripts/sources/equipment.ts
+++ b/src/sources/equipment.ts
@@ -1,6 +1,6 @@
-import { retrieveJson } from '../datasource';
-import { Mutex } from '../mutex';
-import translate, { Translatable, translatePath, } from '../translate';
+import { retrieveJson } from '@/common/datasource';
+import { Mutex } from '@/common/mutex';
+import translate, { Translatable, translatePath, } from '@/common/translate';
 import { GamecoreParam } from './gamecore';
 
 // ItemConfigEquipment.json ?
diff --git a/src/scripts/sources/gamecore.ts b/src/sources/gamecore.ts
similarity index 92%
rename from src/scripts/sources/gamecore.ts
rename to src/sources/gamecore.ts
index 676e2f7..efdf2c0 100644
--- a/src/scripts/sources/gamecore.ts
+++ b/src/sources/gamecore.ts
@@ -1,5 +1,5 @@
-import { cleanupNumber } from '../common'
-import useHashStore from '../hashstore'
+import { cleanupNumber } from '@/common/common'
+import useHashStore from '@/common/hashstore'
 
 export interface DynamicValue
 {
@@ -38,12 +38,12 @@ export interface DynamicExpression
   }
 }
 
-export interface GamecoreNode
+export interface GamecoreTask
 {
   $type: string
 }
 
-export interface GamecoreTargetType extends GamecoreNode
+export interface GamecoreTargetType extends GamecoreTask
 {
   Alias?: string
   Targets?: GamecoreTargetType[]
@@ -59,7 +59,7 @@ export interface HashValues
   }
 }
 
-export interface GamecoreContext
+export interface ExpressionContext
 {
   Params: 
   {
@@ -75,7 +75,7 @@ export interface GamecoreContext
   ModifierId?:string
 }
 
-export interface GamecoreContextDynamicValues
+export interface ExpressionContextDynamicValues
 {
   [hash: number]: 
   {
@@ -101,7 +101,7 @@ export function evaluateTargetType(targetType?:GamecoreTargetType) : string
   return 'unknown'
 }
 
-export function evaluateDynamicExpression(expression?:DynamicExpression, context?:GamecoreContext) : string
+export function evaluateDynamicExpression(expression?:DynamicExpression, context?:ExpressionContext) : string
 {
   if (!expression)
     return 'missing'
@@ -192,7 +192,7 @@ export function evaluateDynamicExpression(expression?:DynamicExpression, context
   return 'unknown'
 }
 
-function findDynamicValue(hash:number, context?:GamecoreContext) : DynamicValue | undefined
+function findDynamicValue(hash:number, context?:ExpressionContext) : DynamicValue | undefined
 {
   if (!context)
     return undefined
@@ -212,7 +212,7 @@ function findDynamicValue(hash:number, context?:GamecoreContext) : DynamicValue
   }
 }
 
-export function explainDynamicValueFromContext(value:DynamicValue, context:GamecoreContext) : string | undefined
+export function explainDynamicValueFromContext(value:DynamicValue, context:ExpressionContext) : string | undefined
 {
   return explainDynamicValue(value, context.Params) ?? ''
 }
diff --git a/src/scripts/sources/monster.ts b/src/sources/monster.ts
similarity index 94%
rename from src/scripts/sources/monster.ts
rename to src/sources/monster.ts
index 1dac805..9df5174 100644
--- a/src/scripts/sources/monster.ts
+++ b/src/sources/monster.ts
@@ -1,7 +1,7 @@
-import { cleanupFilename } from '../common';
-import { retrieveJson } from '../datasource';
-import { Mutex } from '../mutex';
-import translate, { Translatable } from '../translate';
+import { cleanupFilename } from '@/common/common';
+import { retrieveJson } from '@/common/datasource';
+import { Mutex } from '@/common/mutex';
+import translate, { Translatable } from '@/common/translate';
 import { Creature } from './creature';
 import { DynamicValues } from './gamecore';
 
diff --git a/src/scripts/sources/monsterskill.ts b/src/sources/monsterskill.ts
similarity index 94%
rename from src/scripts/sources/monsterskill.ts
rename to src/sources/monsterskill.ts
index 19a8a91..6035288 100644
--- a/src/scripts/sources/monsterskill.ts
+++ b/src/sources/monsterskill.ts
@@ -1,6 +1,6 @@
-import { retrieveJson } from '../datasource';
-import { Mutex } from '../mutex';
-import translate from '../translate';
+import { retrieveJson } from '@/common/datasource';
+import { Mutex } from '@/common/mutex';
+import translate from '@/common/translate';
 import { CreatureSkill } from './skill';
 
 export interface MonsterSkill extends CreatureSkill
diff --git a/src/scripts/sources/relicset.ts b/src/sources/relicset.ts
similarity index 93%
rename from src/scripts/sources/relicset.ts
rename to src/sources/relicset.ts
index e45bf86..cad6f6f 100644
--- a/src/scripts/sources/relicset.ts
+++ b/src/sources/relicset.ts
@@ -1,6 +1,6 @@
-import { retrieveJson } from '../datasource';
-import { Mutex } from '../mutex';
-import translate, { Translatable, } from '../translate';
+import { retrieveJson } from '@/common/datasource';
+import { Mutex } from '@/common/mutex';
+import translate, { Translatable, } from '@/common/translate';
 import { GamecoreParam } from './gamecore';
 
 // Relic Set Skill
diff --git a/src/scripts/sources/skill.ts b/src/sources/skill.ts
similarity index 97%
rename from src/scripts/sources/skill.ts
rename to src/sources/skill.ts
index d196194..5f35fb8 100644
--- a/src/scripts/sources/skill.ts
+++ b/src/sources/skill.ts
@@ -1,4 +1,4 @@
-import { Translatable } from '../translate';
+import { Translatable } from '@/common/translate';
 import { GamecoreParam } from './gamecore';
 
 // AvatarSkillConfig.json       
diff --git a/src/scripts/sources/status.ts b/src/sources/status.ts
similarity index 90%
rename from src/scripts/sources/status.ts
rename to src/sources/status.ts
index 6a24fc4..574cf07 100644
--- a/src/scripts/sources/status.ts
+++ b/src/sources/status.ts
@@ -1,7 +1,7 @@
-import { cleanupMarkup } from '../common';
-import { retrieveJson } from '../datasource';
-import { Mutex } from '../mutex';
-import translate, { Translatable, } from '../translate';
+import { cleanupMarkup } from '@/common/common';
+import { retrieveJson } from '@/common/datasource';
+import { Mutex } from '@/common/mutex';
+import translate, { Translatable, } from '@/common/translate';
 
 // Status
 
diff --git a/src/views/Commit.vue b/src/views/Commit.vue
index 41be105..48c0b65 100644
--- a/src/views/Commit.vue
+++ b/src/views/Commit.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
   import { onErrorCaptured, provide, ref } from 'vue'
-  import LoadingTitle from '@/views/LoadingTitle.vue';
+  import LoadingTitle from '@/components/LoadingTitle.vue';
   import CommitNav from '@/views/navigation/CommitNav.vue'
 
   const props = defineProps<{commitId:string}>()
diff --git a/src/views/Title.vue b/src/views/Title.vue
index a3c93be..e42b37c 100644
--- a/src/views/Title.vue
+++ b/src/views/Title.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
   import { ref } from 'vue';
-  import { retrieveCommits, DataSourceCommit } from '@/scripts/datasource'
+  import { retrieveCommits, DataSourceCommit } from '@/common/datasource'
 
   const commitEntries = ref<DataSourceCommit[]>(await retrieveCommits());
 </script>
diff --git a/src/views/abilities/Ability.vue b/src/views/abilities/Ability.vue
index 079b8e9..9e84382 100644
--- a/src/views/abilities/Ability.vue
+++ b/src/views/abilities/Ability.vue
@@ -1,24 +1,24 @@
 <script setup lang="ts">
   import { watch, inject, Ref, computed, } from 'vue'
-  import { Ability, AbilityContext, } from '@/scripts/sources/ability';
-  import { GamecoreContext } from '@/scripts/sources/gamecore';
-  import AnyBlock from '../gamecore/AnyBlock.vue';
-  import DynamicValues from './DynamicValues.vue';
-  import ShowContext from './ShowContext.vue';
-  import BlockLayout from '../gamecore/BlockLayout.vue';
+  import { Ability, TaskContext, } from '@/sources/ability';
+  import { ExpressionContext } from '@/sources/gamecore';
+  import AnyTask from '@/gamecore/AnyTask.vue';
+  import DynamicValues from './components/DynamicValues.vue';
+  import ShowContext from './components/ShowContext.vue';
+  import BlockLayout from '@/components/BlockLayout.vue';
 
   const props = defineProps<{abilityId:string}>()
-  const abilityContext = inject('abilityContext') as Ref<AbilityContext>
-  const gamecoreContext = inject('gamecoreContext') as Ref<GamecoreContext>
+  const taskContext = inject('taskContext') as Ref<TaskContext>
+  const expressionContext = inject('expressionContext') as Ref<ExpressionContext>
 
-  watch([props, gamecoreContext], () =>
+  watch([props, expressionContext], () =>
   {
-    if (gamecoreContext.value)
-      gamecoreContext.value.AbilityId = props.abilityId
+    if (expressionContext.value)
+      expressionContext.value.AbilityId = props.abilityId
   }, 
   {immediate: true})
 
-  const ability = computed<Ability>(() => abilityContext.value.Abilities?.[props.abilityId])
+  const ability = computed<Ability>(() => taskContext.value.Abilities?.[props.abilityId])
   
   const createModifierRoute = inject<(key:string) => object>('createModifierRoute') as (key:string) => object
 </script>
@@ -34,21 +34,21 @@
         <template v-if="ability.OnAdd">
           <h2>On Add</h2>
           <template v-for="node in ability.OnAdd">
-            <AnyBlock :node="node" />
+            <AnyTask :node="node" />
           </template>
         </template>
 
         <template v-if="ability.OnRemove">
           <h2>On Remove</h2>
           <template v-for="node in ability.OnRemove">
-            <AnyBlock :node="node" />
+            <AnyTask :node="node" />
           </template>
         </template>
 
         <template v-if="ability.OnStart">
           <h2>On Start</h2>
           <template v-for="node in ability.OnStart">
-            <AnyBlock :node="node" />
+            <AnyTask :node="node" />
           </template>
         </template>
 
diff --git a/src/views/abilities/AnyAbility.vue b/src/views/abilities/AnyAbility.vue
index 39a4e86..67446f0 100644
--- a/src/views/abilities/AnyAbility.vue
+++ b/src/views/abilities/AnyAbility.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-  import ProvideEmptyContext from './ProvideEmptyContext.vue';
+  import ProvideEmptyContext from './components/ProvideEmptyContext.vue';
   import Ability from './Ability.vue';
 
   defineProps<{commitId:string, abilityId:string}>()
diff --git a/src/views/abilities/AnyModifier.vue b/src/views/abilities/AnyModifier.vue
index 10c9e44..d5fc113 100644
--- a/src/views/abilities/AnyModifier.vue
+++ b/src/views/abilities/AnyModifier.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-  import ProvideEmptyContext from './ProvideEmptyContext.vue';
+  import ProvideEmptyContext from './components/ProvideEmptyContext.vue';
   import Modifier from './Modifier.vue';
 
   defineProps<{commitId:string, modifierId:string}>()
diff --git a/src/views/abilities/AvatarAbility.vue b/src/views/abilities/AvatarAbility.vue
index 6a3cb31..a5312b6 100644
--- a/src/views/abilities/AvatarAbility.vue
+++ b/src/views/abilities/AvatarAbility.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-  import ProvideAvatarContext from './ProvideAvatarContext.vue';
+  import ProvideAvatarContext from './components/ProvideAvatarContext.vue';
   import Ability from './Ability.vue';
 
   defineProps<{commitId:string, objectId:number, abilityId:string}>()
diff --git a/src/views/abilities/AvatarModifier.vue b/src/views/abilities/AvatarModifier.vue
index 0cb5475..f02103a 100644
--- a/src/views/abilities/AvatarModifier.vue
+++ b/src/views/abilities/AvatarModifier.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-  import ProvideAvatarContext from './ProvideAvatarContext.vue';
+  import ProvideAvatarContext from './components/ProvideAvatarContext.vue';
   import Modifier from './Modifier.vue';
 
   defineProps<{commitId:string, objectId:number, modifierId:string}>()
diff --git a/src/views/abilities/EquipmentAbility.vue b/src/views/abilities/EquipmentAbility.vue
index a77e985..fe45693 100644
--- a/src/views/abilities/EquipmentAbility.vue
+++ b/src/views/abilities/EquipmentAbility.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-  import ProvideEquipmentContext from './ProvideEquipmentContext.vue';
+  import ProvideEquipmentContext from './components/ProvideEquipmentContext.vue';
   import Ability from './Ability.vue';
 
   defineProps<{commitId:string, objectId:number, abilityId:string}>()
diff --git a/src/views/abilities/EquipmentModifier.vue b/src/views/abilities/EquipmentModifier.vue
index d9c6fdf..a76e664 100644
--- a/src/views/abilities/EquipmentModifier.vue
+++ b/src/views/abilities/EquipmentModifier.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-  import ProvideEquipmentContext from './ProvideEquipmentContext.vue';
+  import ProvideEquipmentContext from './components/ProvideEquipmentContext.vue';
   import Modifier from './Modifier.vue';
 
   defineProps<{commitId:string, objectId:number, modifierId:string}>()
diff --git a/src/views/abilities/Modifier.vue b/src/views/abilities/Modifier.vue
index 8309d96..a7c18d8 100644
--- a/src/views/abilities/Modifier.vue
+++ b/src/views/abilities/Modifier.vue
@@ -1,49 +1,49 @@
 <script setup lang="ts">
   import { inject, ref, watch, Ref, } from 'vue'
-  import { GamecoreContext, evaluateTargetType } from '@/scripts/sources/gamecore';
-  import { Modifier, AbilityContext, } from '@/scripts/sources/ability';
-  import { Status, getStatuses } from '@/scripts/sources/status';
-  import useHashStore from '@/scripts/hashstore';
-  import EvaluateExpression from '../gamecore/EvaluateExpression.vue';
-  import BlockLayout from '../gamecore/BlockLayout.vue';
-  import AnyBlock from '../gamecore/AnyBlock.vue';
-  import DynamicValues from './DynamicValues.vue';
-  import RangeChange from './RangeChange.vue';
-  import ShowContext from './ShowContext.vue';
+  import { ExpressionContext, evaluateTargetType } from '@/sources/gamecore';
+  import { Modifier, TaskContext, } from '@/sources/ability';
+  import { Status, getStatuses } from '@/sources/status';
+  import useHashStore from '@/common/hashstore';
+  import EvaluateExpression from '@/gamecore/EvaluateExpression.vue';
+  import BlockLayout from '@/components/BlockLayout.vue';
+  import AnyTask from '@/gamecore/AnyTask.vue';
+  import DynamicValues from './components/DynamicValues.vue';
+  import RangeChange from './components/RangeChange.vue';
+  import ShowContext from './components/ShowContext.vue';
 
   const props = defineProps<{modifierId:string}>()
-  const abilityContext = inject('abilityContext') as Ref<AbilityContext>
-  const gamecoreContext = inject('gamecoreContext') as Ref<GamecoreContext>
+  const taskContext = inject('taskContext') as Ref<TaskContext>
+  const expressionContext = inject('expressionContext') as Ref<ExpressionContext>
 
   watch(props, () =>
   {
-    if (gamecoreContext.value)
-      gamecoreContext.value.ModifierId = props.modifierId
+    if (expressionContext.value)
+      expressionContext.value.ModifierId = props.modifierId
   }, 
   { immediate: true, })
 
   const modifier = ref<Modifier>()
-  watch([props, abilityContext, gamecoreContext], () =>
+  watch([props, taskContext, expressionContext], () =>
   {
-    const mod = abilityContext.value.Modifiers?.[props.modifierId]
+    const mod = taskContext.value.Modifiers?.[props.modifierId]
     if (mod)
     {  
-      if (gamecoreContext.value)
-        gamecoreContext.value.AbilityId = undefined
+      if (expressionContext.value)
+        expressionContext.value.AbilityId = undefined
       modifier.value = mod
       return 
     }
 
-    for (const ability of Object.values(abilityContext.value.Abilities))
+    for (const ability of Object.values(taskContext.value.Abilities))
     {
       const mod = ability.Modifiers?.[props.modifierId]
       if (mod)
       {
-        if (gamecoreContext.value)
+        if (expressionContext.value)
         {
-          gamecoreContext.value.AbilityId = ability.Name
+          expressionContext.value.AbilityId = ability.Name
           if (ability.DynamicValues)
-            gamecoreContext.value.AbilityDynamicValues[ability.Name] = ability.DynamicValues
+            expressionContext.value.AbilityDynamicValues[ability.Name] = ability.DynamicValues
         }
         modifier.value = mod
         return
@@ -166,7 +166,7 @@
         <div class="sticky-container">
           <template v-for="(e, key) in modifier._CallbackList">
             <h3>{{ key }}</h3>
-            <AnyBlock v-for="n in e.CallbackConfig" :node="n" />
+            <AnyTask v-for="n in e.CallbackConfig" :node="n" />
           </template>
         </div>
       </template>
@@ -208,7 +208,7 @@
               
               <div class="subblock">
                 <span class="flow">If</span>
-                <AnyBlock :node="modifier.ModifierAffectedPreshowConfig.Condition" />
+                <AnyTask :node="modifier.ModifierAffectedPreshowConfig.Condition" />
                 <span class="flow">Do</span>
                 <BlockLayout v-for="expression, key in modifier.ModifierAffectedPreshowConfig.ActionDelayPreshowConfig" :source="expression">
                   Preview <em>{{ key }}</em> with value <em><EvaluateExpression :expression="expression" /></em>
diff --git a/src/views/abilities/MonsterAbility.vue b/src/views/abilities/MonsterAbility.vue
index 94856b1..ea171ef 100644
--- a/src/views/abilities/MonsterAbility.vue
+++ b/src/views/abilities/MonsterAbility.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-  import ProvideMonsterContext from './ProvideMonsterContext.vue';
+  import ProvideMonsterContext from './components/ProvideMonsterContext.vue';
   import Ability from './Ability.vue';
 
   defineProps<{commitId:string, objectId:number, abilityId:string}>()
diff --git a/src/views/abilities/MonsterModifier.vue b/src/views/abilities/MonsterModifier.vue
index aadf964..31ed9f0 100644
--- a/src/views/abilities/MonsterModifier.vue
+++ b/src/views/abilities/MonsterModifier.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-  import ProvideMonsterContext from './ProvideMonsterContext.vue';
+  import ProvideMonsterContext from './components/ProvideMonsterContext.vue';
   import Modifier from './Modifier.vue';
 
   defineProps<{commitId:string, objectId:number, modifierId:string}>()
diff --git a/src/views/abilities/RelicSetAbility.vue b/src/views/abilities/RelicSetAbility.vue
index df0320f..5bfd214 100644
--- a/src/views/abilities/RelicSetAbility.vue
+++ b/src/views/abilities/RelicSetAbility.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-  import ProvideRelicSetContext from './ProvideRelicSetContext.vue';
+  import ProvideRelicSetContext from './components/ProvideRelicSetContext.vue';
   import Ability from './Ability.vue';
 
   defineProps<{commitId:string, objectId:number, abilityId:string}>()
diff --git a/src/views/abilities/RelicSetModifier.vue b/src/views/abilities/RelicSetModifier.vue
index ec3755a..ccc1f56 100644
--- a/src/views/abilities/RelicSetModifier.vue
+++ b/src/views/abilities/RelicSetModifier.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-  import ProvideRelicSetContext from './ProvideRelicSetContext.vue';
+  import ProvideRelicSetContext from './components/ProvideRelicSetContext.vue';
   import Modifier from './Modifier.vue';
 
   defineProps<{commitId:string, objectId:number, modifierId:string}>()
diff --git a/src/views/abilities/ShowContext.vue b/src/views/abilities/ShowContext.vue
deleted file mode 100644
index 0f7e93f..0000000
--- a/src/views/abilities/ShowContext.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<script setup lang="ts">
-  import { Ref, inject } from 'vue';
-  import { GamecoreContext } from '@/scripts/sources/gamecore';
-  import BlockLayout from '../gamecore/BlockLayout.vue';
-  
-  const gamecoreContext = inject('gamecoreContext') as Ref<GamecoreContext>
-</script>
-
-<template>
-  <BlockLayout :source="gamecoreContext">
-    <span class="flow">Expression Context</span>
-  </BlockLayout>
-</template>
-
-<style scoped>
-</style>
\ No newline at end of file
diff --git a/src/views/abilities/StatusAbility.vue b/src/views/abilities/StatusAbility.vue
index 93c9b32..1091948 100644
--- a/src/views/abilities/StatusAbility.vue
+++ b/src/views/abilities/StatusAbility.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-  import ProvideEmptyContext from './ProvideEmptyContext.vue';
+  import ProvideEmptyContext from './components/ProvideEmptyContext.vue';
   import Ability from './Ability.vue';
 
   defineProps<{commitId:string, abilityId:string}>()
diff --git a/src/views/abilities/StatusModifier.vue b/src/views/abilities/StatusModifier.vue
index 7dc6b45..5ad45a3 100644
--- a/src/views/abilities/StatusModifier.vue
+++ b/src/views/abilities/StatusModifier.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-  import ProvideEmptyContext from './ProvideEmptyContext.vue';
+  import ProvideEmptyContext from './components/ProvideEmptyContext.vue';
   import Modifier from './Modifier.vue';
 
   defineProps<{commitId:string, modifierId:string}>()
diff --git a/src/views/abilities/DynamicValues.vue b/src/views/abilities/components/DynamicValues.vue
similarity index 59%
rename from src/views/abilities/DynamicValues.vue
rename to src/views/abilities/components/DynamicValues.vue
index cf2e857..f6485b7 100644
--- a/src/views/abilities/DynamicValues.vue
+++ b/src/views/abilities/components/DynamicValues.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
   import { Ref, inject } from 'vue';
-  import { GamecoreContext, 
-    DynamicValues, explainDynamicValueFromContext, } from '@/scripts/sources/gamecore';
-  import useHashStore from '@/scripts/hashstore';
-  import BlockLayout from '../gamecore/BlockLayout.vue';
+  import { ExpressionContext, 
+    DynamicValues, explainDynamicValueFromContext, } from '@/sources/gamecore';
+  import useHashStore from '@/common/hashstore';
+  import BlockLayout from '@/components/BlockLayout.vue';
 
   defineProps<{dynamicValues?:DynamicValues}>()
-  const gamecoreContext = inject('gamecoreContext') as Ref<GamecoreContext>
+  const expressionContext = inject('expressionContext') as Ref<ExpressionContext>
   const hashStore = useHashStore()
 </script>
 
@@ -17,7 +17,7 @@
       <BlockLayout v-for="value, key in dynamicValues.Values" :source="value" :title="key">
         {{ hashStore.translate(key as number) ?? key }}
         <template v-if="value.ReadInfo">
-          = <em>{{ explainDynamicValueFromContext(value, gamecoreContext) }}</em>
+          = <em>{{ explainDynamicValueFromContext(value, expressionContext) }}</em>
         </template>
       </BlockLayout>
     </template>
diff --git a/src/views/abilities/ProvideAvatarContext.vue b/src/views/abilities/components/ProvideAvatarContext.vue
similarity index 66%
rename from src/views/abilities/ProvideAvatarContext.vue
rename to src/views/abilities/components/ProvideAvatarContext.vue
index c024ef1..cd34c26 100644
--- a/src/views/abilities/ProvideAvatarContext.vue
+++ b/src/views/abilities/components/ProvideAvatarContext.vue
@@ -1,31 +1,31 @@
 <script setup lang="ts">
   import { ref, watch, provide, } from 'vue'
-  import { getAvatar, } from '@/scripts/sources/avatar';
-  import { getAvatarSkillsByIds, } from '@/scripts/sources/avatarskill';
-  import { getCharacterByAvatar, } from '@/scripts/sources/character';
-  import { getAbilityContext, AbilityContext, AbilityContextType, } from '@/scripts/sources/ability';
-  import { GamecoreContext, } from '@/scripts/sources/gamecore';
+  import { getAvatar, } from '@/sources/avatar';
+  import { getAvatarSkillsByIds, } from '@/sources/avatarskill';
+  import { getCharacterByAvatar, } from '@/sources/character';
+  import { getTaskContext, TaskContext, TaskContextType, } from '@/sources/ability';
+  import { ExpressionContext, } from '@/sources/gamecore';
 
   import { buildAbilityValues, } from './helper'
 
   const props = defineProps<{commitId:string, objectId:number}>()
   
-  const gamecoreContext = ref<GamecoreContext>(await getGamecoreContext())
-  const abilityContext = ref<AbilityContext>(await getAbilityContext(props.commitId, AbilityContextType.Avatar))
+  const expressionContext = ref<ExpressionContext>(await getexpressionContext())
+  const taskContext = ref<TaskContext>(await getTaskContext(props.commitId, TaskContextType.Avatar))
 
   watch(props, async () => 
   {
-    gamecoreContext.value = await getGamecoreContext()
-    abilityContext.value = await getAbilityContext(props.commitId, AbilityContextType.Avatar)
+    expressionContext.value = await getexpressionContext()
+    taskContext.value = await getTaskContext(props.commitId, TaskContextType.Avatar)
   })
 
-  async function getGamecoreContext()
+  async function getexpressionContext()
   {
     const avatar = await getAvatar(props.commitId, props.objectId)
     const avatarSkills = await getAvatarSkillsByIds(props.commitId, avatar.SkillList)
     const character = await getCharacterByAvatar(props.commitId, avatar)
     
-    const context:GamecoreContext = 
+    const context:ExpressionContext = 
     {
       Params: {},
       AbilityValues: buildAbilityValues(character, avatarSkills),
@@ -52,8 +52,8 @@
     return context
   }
 
-  provide('gamecoreContext', gamecoreContext)
-  provide('abilityContext', abilityContext)
+  provide('expressionContext', expressionContext)
+  provide('taskContext', taskContext)
   provide('createAbilityRoute', (abilityId:string) : object => { return { name:'avatarAbility', params:{ commitId: props.commitId, objectId: props.objectId, abilityId: abilityId, } }})
   provide('createModifierRoute', (modifierId:string) : object => { return { name:'avatarModifier', params:{ commitId: props.commitId, objectId: props.objectId, modifierId: modifierId, } }})
 </script>
diff --git a/src/views/abilities/ProvideEmptyContext.vue b/src/views/abilities/components/ProvideEmptyContext.vue
similarity index 57%
rename from src/views/abilities/ProvideEmptyContext.vue
rename to src/views/abilities/components/ProvideEmptyContext.vue
index 93dde69..0599acb 100644
--- a/src/views/abilities/ProvideEmptyContext.vue
+++ b/src/views/abilities/components/ProvideEmptyContext.vue
@@ -1,22 +1,22 @@
 <script setup lang="ts">
   import { ref, watch, provide, } from 'vue';
-  import { GamecoreContext } from '@/scripts/sources/gamecore';
-  import { getAbilityContext, AbilityContext, AbilityContextType, } from '@/scripts/sources/ability';
+  import { ExpressionContext } from '@/sources/gamecore';
+  import { getTaskContext, TaskContext, TaskContextType, } from '@/sources/ability';
 
   const props = defineProps<{commitId:string, abilityRouteName?:string, modifierRouteName?:string}>()
   
-  const gamecoreContext = ref<GamecoreContext>(await getGamecoreContext())
-  const abilityContext = ref<AbilityContext>(await getAbilityContext(props.commitId, AbilityContextType.All))
+  const expressionContext = ref<ExpressionContext>(await getexpressionContext())
+  const taskContext = ref<TaskContext>(await getTaskContext(props.commitId, TaskContextType.All))
 
   watch(props, async () => 
   {
-    gamecoreContext.value = await getGamecoreContext()
-    abilityContext.value = await getAbilityContext(props.commitId, AbilityContextType.All)
+    expressionContext.value = await getexpressionContext()
+    taskContext.value = await getTaskContext(props.commitId, TaskContextType.All)
   })
 
-  async function getGamecoreContext()
+  async function getexpressionContext()
   {
-    const context:GamecoreContext = 
+    const context:ExpressionContext = 
     {
       Params: {},
       AbilityValues: {},
@@ -25,8 +25,8 @@
     return context
   }
 
-  provide('gamecoreContext', gamecoreContext)
-  provide('abilityContext', abilityContext)
+  provide('expressionContext', expressionContext)
+  provide('taskContext', taskContext)
   provide('createAbilityRoute', (abilityId:string) : object => { return { name: props.abilityRouteName ?? 'ability', params:{ commitId: props.commitId, abilityId: abilityId, } }})
   provide('createModifierRoute', (modifierId:string) : object => { return { name: props.modifierRouteName ?? 'modifier', params:{ commitId: props.commitId, modifierId: modifierId, } }})
 </script>
diff --git a/src/views/abilities/ProvideEquipmentContext.vue b/src/views/abilities/components/ProvideEquipmentContext.vue
similarity index 54%
rename from src/views/abilities/ProvideEquipmentContext.vue
rename to src/views/abilities/components/ProvideEquipmentContext.vue
index 097045a..26b5b9f 100644
--- a/src/views/abilities/ProvideEquipmentContext.vue
+++ b/src/views/abilities/components/ProvideEquipmentContext.vue
@@ -1,24 +1,24 @@
 <script setup lang="ts">
   import { ref, watch, provide, } from 'vue';
-  import { GamecoreContext } from '@/scripts/sources/gamecore';
-  import { getEquipment } from '@/scripts/sources/equipment';
-  import { getAbilityContext, AbilityContext, AbilityContextType, } from '@/scripts/sources/ability';
+  import { ExpressionContext } from '@/sources/gamecore';
+  import { getEquipment } from '@/sources/equipment';
+  import { getTaskContext, TaskContext, TaskContextType, } from '@/sources/ability';
 
   const props = defineProps<{commitId:string, objectId:number}>()
   
-  const gamecoreContext = ref<GamecoreContext>(await getGamecoreContext())
-  const abilityContext = ref<AbilityContext>(await getAbilityContext(props.commitId, AbilityContextType.Equipment))
+  const expressionContext = ref<ExpressionContext>(await getexpressionContext())
+  const taskContext = ref<TaskContext>(await getTaskContext(props.commitId, TaskContextType.Equipment))
 
   watch(props, async () => 
   {
-    gamecoreContext.value = await getGamecoreContext()
-    abilityContext.value = await getAbilityContext(props.commitId, AbilityContextType.Equipment)
+    expressionContext.value = await getexpressionContext()
+    taskContext.value = await getTaskContext(props.commitId, TaskContextType.Equipment)
   })
 
-  async function getGamecoreContext()
+  async function getexpressionContext()
   {
     const equipment = await getEquipment(props.commitId, props.objectId)
-    const context:GamecoreContext = 
+    const context:ExpressionContext = 
     {
       Params: 
       {
@@ -30,8 +30,8 @@
     return context
   }
 
-  provide('gamecoreContext', gamecoreContext)
-  provide('abilityContext', abilityContext)
+  provide('expressionContext', expressionContext)
+  provide('taskContext', taskContext)
   provide('createAbilityRoute', (abilityId:string) : object => { return { name:'equipmentAbility', params:{ commitId: props.commitId, objectId: props.objectId, abilityId: abilityId, } }})
   provide('createModifierRoute', (modifierId:string) : object => { return { name:'equipmentModifier', params:{ commitId: props.commitId, objectId: props.objectId, modifierId: modifierId, } }})
 </script>
diff --git a/src/views/abilities/ProvideMonsterContext.vue b/src/views/abilities/components/ProvideMonsterContext.vue
similarity index 58%
rename from src/views/abilities/ProvideMonsterContext.vue
rename to src/views/abilities/components/ProvideMonsterContext.vue
index 515d69f..297f3f7 100644
--- a/src/views/abilities/ProvideMonsterContext.vue
+++ b/src/views/abilities/components/ProvideMonsterContext.vue
@@ -1,30 +1,30 @@
 <script setup lang="ts">
   import { ref, watch, provide,} from 'vue'
-  import { getMonster, } from '@/scripts/sources/monster';
-  import { getMonsterSkillsByIds, } from '@/scripts/sources/monsterskill';
-  import { getCharacterByMonster, } from '@/scripts/sources/character';
-  import { getAbilityContext, AbilityContext, AbilityContextType, } from '@/scripts/sources/ability';
-  import { GamecoreContext, } from '@/scripts/sources/gamecore';
+  import { getMonster, } from '@/sources/monster';
+  import { getMonsterSkillsByIds, } from '@/sources/monsterskill';
+  import { getCharacterByMonster, } from '@/sources/character';
+  import { getTaskContext, TaskContext, TaskContextType, } from '@/sources/ability';
+  import { ExpressionContext, } from '@/sources/gamecore';
   import { buildAbilityValues } from './helper';
 
   const props = defineProps<{commitId:string, objectId:number}>()
   
-  const gamecoreContext = ref<GamecoreContext>(await getGamecoreContext())
-  const abilityContext = ref<AbilityContext>(await getAbilityContext(props.commitId, AbilityContextType.Monster))
+  const expressionContext = ref<ExpressionContext>(await getexpressionContext())
+  const taskContext = ref<TaskContext>(await getTaskContext(props.commitId, TaskContextType.Monster))
 
   watch(props, async () => 
   {
-    gamecoreContext.value = await getGamecoreContext()
-    abilityContext.value = await getAbilityContext(props.commitId, AbilityContextType.Monster)
+    expressionContext.value = await getexpressionContext()
+    taskContext.value = await getTaskContext(props.commitId, TaskContextType.Monster)
   })
 
-  async function getGamecoreContext()
+  async function getexpressionContext()
   {
     const monster = await getMonster(props.commitId, props.objectId)
     const monsterSkills = await getMonsterSkillsByIds(props.commitId, monster.SkillList)
     const character = await getCharacterByMonster(props.commitId, monster)
 
-    const context:GamecoreContext = 
+    const context:ExpressionContext = 
     {
       Params: {},
       AbilityValues: buildAbilityValues(character, monsterSkills),
@@ -39,8 +39,8 @@
     return context
   }
   
-  provide('gamecoreContext', gamecoreContext)
-  provide('abilityContext', abilityContext)
+  provide('expressionContext', expressionContext)
+  provide('taskContext', taskContext)
   provide('createAbilityRoute', (abilityId:string) : object => { return { name:'monsterAbility', params:{ commitId: props.commitId, objectId: props.objectId, abilityId: abilityId, } }})
   provide('createModifierRoute', (modifierId:string) : object => { return { name:'monsterModifier', params:{ commitId: props.commitId, objectId: props.objectId, modifierId: modifierId, } }})
 </script>
diff --git a/src/views/abilities/ProvideRelicSetContext.vue b/src/views/abilities/components/ProvideRelicSetContext.vue
similarity index 56%
rename from src/views/abilities/ProvideRelicSetContext.vue
rename to src/views/abilities/components/ProvideRelicSetContext.vue
index 924f145..ea35cc0 100644
--- a/src/views/abilities/ProvideRelicSetContext.vue
+++ b/src/views/abilities/components/ProvideRelicSetContext.vue
@@ -1,24 +1,24 @@
 <script setup lang="ts">
   import { ref, watch, provide, } from 'vue';
-  import { GamecoreContext } from '@/scripts/sources/gamecore';
-  import { getRelicSet } from '@/scripts/sources/relicset';
-  import { getAbilityContext, AbilityContext, AbilityContextType, } from '@/scripts/sources/ability';
+  import { ExpressionContext } from '@/sources/gamecore';
+  import { getRelicSet } from '@/sources/relicset';
+  import { getTaskContext, TaskContext, TaskContextType, } from '@/sources/ability';
 
   const props = defineProps<{commitId:string, objectId:number}>()
   
-  const gamecoreContext = ref<GamecoreContext>(await getGamecoreContext())
-  const abilityContext = ref<AbilityContext>(await getAbilityContext(props.commitId, AbilityContextType.RelicSet))
+  const expressionContext = ref<ExpressionContext>(await getexpressionContext())
+  const taskContext = ref<TaskContext>(await getTaskContext(props.commitId, TaskContextType.RelicSet))
   
   watch(props, async () => 
   {
-    gamecoreContext.value = await getGamecoreContext()
-    abilityContext.value = await getAbilityContext(props.commitId, AbilityContextType.RelicSet)
+    expressionContext.value = await getexpressionContext()
+    taskContext.value = await getTaskContext(props.commitId, TaskContextType.RelicSet)
   })
 
-  async function getGamecoreContext()
+  async function getexpressionContext()
   {
     const relicSet = await getRelicSet(props.commitId, props.objectId)
-    const context:GamecoreContext = 
+    const context:ExpressionContext = 
     {
       Params: {},
       AbilityValues: {},
@@ -29,8 +29,8 @@
     return context
   }
   
-  provide('gamecoreContext', gamecoreContext)
-  provide('abilityContext', abilityContext)
+  provide('expressionContext', expressionContext)
+  provide('taskContext', taskContext)
   provide('createAbilityRoute', (abilityId:string) : object => { return { name:'relicsetAbility', params:{ commitId: props.commitId, objectId: props.objectId, abilityId: abilityId, } }})
   provide('createModifierRoute', (modifierId:string) : object => { return { name:'relicsetModifier', params:{ commitId: props.commitId, objectId: props.objectId, modifierId: modifierId, } }})
 </script>
diff --git a/src/views/abilities/RangeChange.vue b/src/views/abilities/components/RangeChange.vue
similarity index 71%
rename from src/views/abilities/RangeChange.vue
rename to src/views/abilities/components/RangeChange.vue
index 55159ce..0f80ea0 100644
--- a/src/views/abilities/RangeChange.vue
+++ b/src/views/abilities/components/RangeChange.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-  import { RangeWatcher, } from '@/scripts/sources/ability';
-  import EvaluateExpression from '../gamecore/EvaluateExpression.vue';
-  import BlockLayout from '../gamecore/BlockLayout.vue';
-  import AnyBlock from '../gamecore/AnyBlock.vue';
+  import { RangeWatcher, } from '@/sources/ability';
+  import EvaluateExpression from '@/gamecore/EvaluateExpression.vue';
+  import BlockLayout from '@/components/BlockLayout.vue';
+  import AnyTask from '@/gamecore/AnyTask.vue';
 
   defineProps<{range:RangeWatcher}>()
 </script>
@@ -21,19 +21,19 @@
       <BlockLayout v-if="range.OnEnterRange" :source="range.OnEnterRange">
         <span class="flow">On Enter Range</span>
         <template #content>
-          <AnyBlock v-for="n in range.OnEnterRange" :node="n" />
+          <AnyTask v-for="n in range.OnEnterRange" :node="n" />
         </template>
       </BlockLayout>
       <BlockLayout v-if="range.OnExitRange" :source="range.OnExitRange">
         <span class="flow">On Exit Range</span>
         <template #content>
-          <AnyBlock v-for="n in range.OnExitRange" :node="n" />
+          <AnyTask v-for="n in range.OnExitRange" :node="n" />
         </template>
       </BlockLayout>
       <BlockLayout v-if="range.OnChange" :source="range.OnChange">
         <span class="flow">On Change</span>
         <template #content>
-          <AnyBlock v-for="n in range.OnChange" :node="n" />
+          <AnyTask v-for="n in range.OnChange" :node="n" />
         </template>
       </BlockLayout>
     </template>
diff --git a/src/views/abilities/components/ShowContext.vue b/src/views/abilities/components/ShowContext.vue
new file mode 100644
index 0000000..399efe3
--- /dev/null
+++ b/src/views/abilities/components/ShowContext.vue
@@ -0,0 +1,16 @@
+<script setup lang="ts">
+  import { Ref, inject } from 'vue';
+  import { ExpressionContext } from '@/sources/gamecore';
+  import BlockLayout from '@/components/BlockLayout.vue';
+  
+  const expressionContext = inject('expressionContext') as Ref<ExpressionContext>
+</script>
+
+<template>
+  <BlockLayout :source="expressionContext">
+    <span class="flow">Expression Context</span>
+  </BlockLayout>
+</template>
+
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/abilities/helper.ts b/src/views/abilities/components/helper.ts
similarity index 84%
rename from src/views/abilities/helper.ts
rename to src/views/abilities/components/helper.ts
index a620d2f..615ff4c 100644
--- a/src/views/abilities/helper.ts
+++ b/src/views/abilities/components/helper.ts
@@ -1,6 +1,6 @@
-import { Character } from "@/scripts/sources/character"
-import { HashValues } from "@/scripts/sources/gamecore"
-import { CreatureSkill } from "@/scripts/sources/skill"
+import { Character } from "@/sources/character"
+import { HashValues } from "@/sources/gamecore"
+import { CreatureSkill } from "@/sources/skill"
 
 export function buildAbilityValues(character:Character, skills:CreatureSkill[]) : HashValues
 {
diff --git a/src/views/gamecore/AnyBlock.vue b/src/views/gamecore/AnyBlock.vue
deleted file mode 100644
index 27bc647..0000000
--- a/src/views/gamecore/AnyBlock.vue
+++ /dev/null
@@ -1,31 +0,0 @@
-<script setup lang="ts">
-  import { defineAsyncComponent, } from 'vue'
-  import { GamecoreNode, } from '@/scripts/sources/gamecore';
-  import { gamecoreToComponentName, } from '@/scripts/common';
-
-  const props = defineProps<{node:GamecoreNode}>()
-  let blockName = gamecoreToComponentName(props.node.$type)
-  const blockComponent = defineAsyncComponent({
-    loader: async () => 
-    {
-      try { return await import(`./blocks/${blockName}.vue`) }
-      catch (error:any) 
-      { 
-        if (!error.toString().includes('Unknown variable dynamic import'))
-          console.error(error)
-        return await import(`./MissingBlock.vue`)
-      }
-    },
-  })
-  const inversibleNode = props.node as unknown as 
-  {
-    Inverse:boolean
-  }
-</script>
-
-<template>
-  <component :is="blockComponent" :node="node" :class="inversibleNode.Inverse ? 'inverted' : ''" />
-</template>
-
-<style scoped>
-</style>
\ No newline at end of file
diff --git a/src/views/gamecore/MissingBlock.vue b/src/views/gamecore/MissingBlock.vue
deleted file mode 100644
index 68b18a8..0000000
--- a/src/views/gamecore/MissingBlock.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<script setup lang="ts">
-  import { GamecoreNode, } from '@/scripts/sources/gamecore';
-  import { cleanGamecoreName, } from '@/scripts/common';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
-
-  defineProps<{node:GamecoreNode}>()
-</script>
-
-<template>
-  <BlockLayout :source="node">
-    <span class="notimplemented">{{ cleanGamecoreName(node.$type) }}</span>
-  </BlockLayout>
-</template>
-
-<style scoped>
-</style>
\ No newline at end of file
diff --git a/src/views/gamecore/blocks/ByAnd.vue b/src/views/gamecore/blocks/ByAnd.vue
deleted file mode 100644
index 645ecfd..0000000
--- a/src/views/gamecore/blocks/ByAnd.vue
+++ /dev/null
@@ -1,24 +0,0 @@
-<script setup lang="ts">
-  import { GamecoreNode, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
-  import AnyBlock from '../AnyBlock.vue';
-
-  const props = defineProps<{node:GamecoreNode}>()
-  const node = props.node as unknown as 
-  {
-    PredicateList:GamecoreNode[]
-  }
-</script>
-
-<template>
-  <BlockLayout :source="node">
-    <span class="flow">All</span>
-    <template #content>
-      <AnyBlock v-for="predicate in node.PredicateList" :node="predicate" />
-    </template>
-  </BlockLayout>
-</template>
-
-<style scoped>
-</style>
\ No newline at end of file
diff --git a/src/views/gamecore/blocks/ByAny.vue b/src/views/gamecore/blocks/ByAny.vue
deleted file mode 100644
index 05853fc..0000000
--- a/src/views/gamecore/blocks/ByAny.vue
+++ /dev/null
@@ -1,24 +0,0 @@
-<script setup lang="ts">
-  import { GamecoreNode, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
-  import AnyBlock from '../AnyBlock.vue';
-
-  const props = defineProps<{node:GamecoreNode}>()
-  const node = props.node as unknown as 
-  {
-    PredicateList:GamecoreNode[]
-  }
-</script>
-
-<template>
-  <BlockLayout :source="node">
-    <span class="flow">Any</span>
-    <template #content>
-      <AnyBlock v-for="predicate in node.PredicateList" :node="predicate" />
-    </template>
-  </BlockLayout>
-</template>
-
-<style scoped>
-</style>
\ No newline at end of file
diff --git a/src/views/gamecore/blocks/ByNot.vue b/src/views/gamecore/blocks/ByNot.vue
deleted file mode 100644
index a365a2e..0000000
--- a/src/views/gamecore/blocks/ByNot.vue
+++ /dev/null
@@ -1,24 +0,0 @@
-<script setup lang="ts">
-  import { GamecoreNode, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
-  import AnyBlock from '../AnyBlock.vue';
-
-  const props = defineProps<{node:GamecoreNode}>()
-  const node = props.node as unknown as 
-  {
-    Predicate:GamecoreNode
-  }
-</script>
-
-<template>
-  <BlockLayout :source="node">
-    <span class="flow">Not</span>
-    <template #content>
-      <AnyBlock :node="node.Predicate" />
-    </template>
-  </BlockLayout>
-</template>
-
-<style scoped>
-</style>
\ No newline at end of file
diff --git a/src/views/gamecore/blocks/DamagePerformFinish.vue b/src/views/gamecore/blocks/DamagePerformFinish.vue
deleted file mode 100644
index 46b7a5b..0000000
--- a/src/views/gamecore/blocks/DamagePerformFinish.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<script setup lang="ts">
-  import { GamecoreNode, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
-
-  defineProps<{node:GamecoreNode}>()
-</script>
-
-<template>
-  <BlockLayout :source="node">
-    Finalize Damage
-  </BlockLayout>
-</template>
-
-<style scoped>
-</style>
\ No newline at end of file
diff --git a/src/views/gamecore/blocks/IncludeTaskListTemplate.vue b/src/views/gamecore/blocks/IncludeTaskListTemplate.vue
deleted file mode 100644
index 5ebc85c..0000000
--- a/src/views/gamecore/blocks/IncludeTaskListTemplate.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<script setup lang="ts">
-  import { Ref, inject, watch, ref } from 'vue';
-  import { GamecoreContext, GamecoreNode, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
-  import { AbilityContext, TaskListTemplate, findTaskTemplate, } from '@/scripts/sources/ability';
-  import AnyBlock from '../AnyBlock.vue';
-
-  const props = defineProps<{node:GamecoreNode}>()
-  const node = props.node as unknown as 
-  {
-    Name:string
-  }
-
-  const gamecoreContext = inject('gamecoreContext') as Ref<GamecoreContext>
-  const abilityContext = inject('abilityContext') as Ref<AbilityContext>
-
-  const taskTemplate = ref<TaskListTemplate>()
-  watch([gamecoreContext, abilityContext], () =>
-  {
-    taskTemplate.value = findTaskTemplate(node.Name, gamecoreContext.value, abilityContext.value)
-  },
-  { immediate:true })
-</script>
-
-<template>
-  <BlockLayout :source="node">
-    <span class="flow">
-      Include task list template 
-      <em>{{ node.Name }}</em>
-    </span>
-    <template #content v-if="taskTemplate">
-      <AnyBlock v-for="task in taskTemplate.TaskList" :node="task" />
-    </template>
-    <template #content v-else>
-      <div class="subblock">
-        Not found
-      </div>
-    </template>
-  </BlockLayout>
-</template>
-
-<style scoped>
-</style>
\ No newline at end of file
diff --git a/src/views/gamecore/blocks/MakeSuccess.vue b/src/views/gamecore/blocks/MakeSuccess.vue
deleted file mode 100644
index 3e380a8..0000000
--- a/src/views/gamecore/blocks/MakeSuccess.vue
+++ /dev/null
@@ -1,25 +0,0 @@
-<script setup lang="ts">
-  import { GamecoreNode, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
-  import AnyBlock from '@/views/gamecore/AnyBlock.vue';
-
-  const props = defineProps<{node:GamecoreNode}>()
-  const node = props.node as unknown as 
-  {
-    Task:GamecoreNode
-  }
-
-</script>
-
-<template>
-  <BlockLayout :source="node" :cosmetic="true">
-    <span class="flow">Make success(?)</span>
-    <template #content>
-      <AnyBlock :node="node.Task" />
-    </template>
-  </BlockLayout>
-</template>
-
-<style scoped>
-</style>
\ No newline at end of file
diff --git a/src/views/gamecore/blocks/RemoveSelfModifier.vue b/src/views/gamecore/blocks/RemoveSelfModifier.vue
deleted file mode 100644
index 3a98913..0000000
--- a/src/views/gamecore/blocks/RemoveSelfModifier.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<script setup lang="ts">
-  import { GamecoreNode,
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
-
-  defineProps<{node:GamecoreNode}>()
-</script>
-
-<template>
-  <BlockLayout :source="node">
-    Remove this modifier
-  </BlockLayout>
-</template>
-
-<style scoped>
-</style>
\ No newline at end of file
diff --git a/src/views/gamecore/blocks/SkillExecutionStart.vue b/src/views/gamecore/blocks/SkillExecutionStart.vue
deleted file mode 100644
index 82e27c2..0000000
--- a/src/views/gamecore/blocks/SkillExecutionStart.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<script setup lang="ts">
-  import { GamecoreNode, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
-
-  defineProps<{node:GamecoreNode}>()
-</script>
-
-<template>
-  <BlockLayout :source="node">
-    Begin Skill
-  </BlockLayout>
-</template>
-
-<style scoped>
-</style>
\ No newline at end of file
diff --git a/src/views/gamecore/blocks/SkillPerformFinish.vue b/src/views/gamecore/blocks/SkillPerformFinish.vue
deleted file mode 100644
index 4f58c39..0000000
--- a/src/views/gamecore/blocks/SkillPerformFinish.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<script setup lang="ts">
-  import { GamecoreNode, 
-  } from '@/scripts/sources/gamecore';
-  import BlockLayout from '@/views/gamecore/BlockLayout.vue';
-
-  defineProps<{node:GamecoreNode}>()
-</script>
-
-<template>
-  <BlockLayout :source="node">
-    Finalize Skill
-  </BlockLayout>
-</template>
-
-<style scoped>
-</style>
\ No newline at end of file
diff --git a/src/views/navigation/AvatarNav.vue b/src/views/navigation/AvatarNav.vue
index 627bc8f..c585350 100644
--- a/src/views/navigation/AvatarNav.vue
+++ b/src/views/navigation/AvatarNav.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
   import { ref, computed, inject, Ref, } from 'vue'
   import { RouterLink, } from 'vue-router';
-  import { Grouped, } from '@/scripts/common';
-  import { getAvatars, Avatar, AvatarConfig, } from '@/scripts/sources/avatar';
+  import { Grouped, } from '@/common/common';
+  import { getAvatars, Avatar, AvatarConfig, } from '@/sources/avatar';
   import NavTree from '@/components/NavTree.vue'
   import NavItem from '@/components/NavItem.vue'
 
diff --git a/src/views/navigation/AvatarSubNav.vue b/src/views/navigation/AvatarSubNav.vue
index 17a9a8a..6c1fae6 100644
--- a/src/views/navigation/AvatarSubNav.vue
+++ b/src/views/navigation/AvatarSubNav.vue
@@ -1,15 +1,15 @@
 <script setup lang="ts">
   import { ref, watchEffect, } from 'vue'
-  import { getAvatar, type Avatar, } from '@/scripts/sources/avatar';
-  import { AbilityContextType } from '@/scripts/sources/ability';
-  import { getAvatarSkillsByIds, AvatarSkill, } from '@/scripts/sources/avatarskill';
-  import { getCharacterByAvatar, Character } from '@/scripts/sources/character';
+  import { getAvatar, type Avatar, } from '@/sources/avatar';
+  import { TaskContextType } from '@/sources/ability';
+  import { getAvatarSkillsByIds, AvatarSkill, } from '@/sources/avatarskill';
+  import { getCharacterByAvatar, Character } from '@/sources/character';
   import CharacterSkillAbilitiesNav from './CharacterSkillAbilitiesNav.vue';
   import CharacterOtherAbilitiesNav from './CharacterOtherAbilitiesNav.vue';
   import CharacterModifiers from './CharacterModifiers.vue';
   import NavTree from '@/components/NavTree.vue'
   import NavItem from '@/components/NavItem.vue'
-  import LoadingNav from '../LoadingNav.vue';
+  import LoadingNav from '@/components/LoadingNav.vue';
 
   const props = defineProps<{commitId:string, objectId:number}>()
 
@@ -111,7 +111,7 @@
       <NavItem v-if="character">
         <NavTree>
           <template #header>Modifiers</template>
-          <CharacterModifiers :character="character" :abilityContextType="AbilityContextType.Avatar" v-slot="slotProps">
+          <CharacterModifiers :character="character" :taskContextType="TaskContextType.Avatar" v-slot="slotProps">
             <RouterLink :to="{ name:'avatarModifier', params:{ commitId: commitId, objectId: objectId, modifierId: slotProps.modifier, }}">
               {{ slotProps.modifier }}
             </RouterLink>
diff --git a/src/views/navigation/CharacterModifiers.vue b/src/views/navigation/CharacterModifiers.vue
index 48c8b5d..dc7120b 100644
--- a/src/views/navigation/CharacterModifiers.vue
+++ b/src/views/navigation/CharacterModifiers.vue
@@ -1,27 +1,27 @@
 <script setup lang="ts">
   import { ref, watch, inject, } from 'vue'
-  import { Character } from '@/scripts/sources/character'
-  import { Ability, AbilityContextType, getAbilityContext, } from '@/scripts/sources/ability';
+  import { Character } from '@/sources/character'
+  import { Ability, TaskContextType, getTaskContext, } from '@/sources/ability';
   import NavItem from '@/components/NavItem.vue'
 
-  const props = defineProps<{character:Character, abilityContextType:AbilityContextType}>()
+  const props = defineProps<{character:Character, taskContextType:TaskContextType}>()
 
   const commitId = inject<string>('commitId') as string
   const modifiers = ref<string[]>([])
 
   watch(props, async () => 
   {
-    const abilityContext = await getAbilityContext(commitId, props.abilityContextType)
+    const taskContext = await getTaskContext(commitId, props.taskContextType)
 
     const mods:string[] = []
     if (props.character)
     {
       for (const skillEntry of props.character.SkillAbilityList)
         for (const abilityName of skillEntry.AbilityList)
-          addModifierNamesFromAbility(mods, abilityContext.Abilities[abilityName])
+          addModifierNamesFromAbility(mods, taskContext.Abilities[abilityName])
 
       for (const abilityName of props.character.AbilityList)
-          addModifierNamesFromAbility(mods, abilityContext.Abilities[abilityName])
+          addModifierNamesFromAbility(mods, taskContext.Abilities[abilityName])
     }
     mods.sort((a, b) => a > b ? 1 : -1)
     modifiers.value = mods
diff --git a/src/views/navigation/CharacterOtherAbilitiesNav.vue b/src/views/navigation/CharacterOtherAbilitiesNav.vue
index 1a50b6d..15b5d3d 100644
--- a/src/views/navigation/CharacterOtherAbilitiesNav.vue
+++ b/src/views/navigation/CharacterOtherAbilitiesNav.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-  import { Character } from '@/scripts/sources/character';
+  import { Character } from '@/sources/character';
   import NavTree from '@/components/NavTree.vue'
   import NavItem from '@/components/NavItem.vue'
 
diff --git a/src/views/navigation/CharacterSkillAbilitiesNav.vue b/src/views/navigation/CharacterSkillAbilitiesNav.vue
index 269bacf..580d96e 100644
--- a/src/views/navigation/CharacterSkillAbilitiesNav.vue
+++ b/src/views/navigation/CharacterSkillAbilitiesNav.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
   import { ref, watchEffect } from 'vue'
-  import { Character } from '@/scripts/sources/character';
+  import { Character } from '@/sources/character';
   import NavTree from '@/components/NavTree.vue'
   import NavItem from '@/components/NavItem.vue'
 
diff --git a/src/views/navigation/EquipmentNav.vue b/src/views/navigation/EquipmentNav.vue
index e2cc391..83c1557 100644
--- a/src/views/navigation/EquipmentNav.vue
+++ b/src/views/navigation/EquipmentNav.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
   import { ref, computed, inject, Ref, } from 'vue'
   import { RouterLink } from 'vue-router';
-  import { Grouped, } from '@/scripts/common.ts';
-  import { getEquipments, Equipment, EquipmentConfig, } from '@/scripts/sources/equipment';
+  import { Grouped, } from '@/common/common.ts';
+  import { getEquipments, Equipment, EquipmentConfig, } from '@/sources/equipment';
   import NavTree from '@/components/NavTree.vue'
   import NavItem from '@/components/NavItem.vue'
 
diff --git a/src/views/navigation/EquipmentSubNav.vue b/src/views/navigation/EquipmentSubNav.vue
index 3200a52..8b77fa2 100644
--- a/src/views/navigation/EquipmentSubNav.vue
+++ b/src/views/navigation/EquipmentSubNav.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
   import { ref, watchEffect, } from 'vue'
-  import { getEquipment, Equipment, } from '@/scripts/sources/equipment';
+  import { getEquipment, Equipment, } from '@/sources/equipment';
   import NavTree from '@/components/NavTree.vue'
   import NavItem from '@/components/NavItem.vue'
-  import LoadingNav from '../LoadingNav.vue';
+  import LoadingNav from '@/components/LoadingNav.vue';
 
   const props = defineProps<{commitId:string, objectId:number}>()
 
diff --git a/src/views/navigation/MonsterNav.vue b/src/views/navigation/MonsterNav.vue
index d5c72c9..a4dac92 100644
--- a/src/views/navigation/MonsterNav.vue
+++ b/src/views/navigation/MonsterNav.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
   import { ref, computed, inject, Ref, } from 'vue'
   import { RouterLink } from 'vue-router';
-  import { Grouped2, } from '@/scripts/common';
-  import { getMonsters, Monster, MonsterConfig, } from '@/scripts/sources/monster';
+  import { Grouped2, } from '@/common/common';
+  import { getMonsters, Monster, MonsterConfig, } from '@/sources/monster';
   import NavTree from '@/components/NavTree.vue'
   import NavItem from '@/components/NavItem.vue'
 
diff --git a/src/views/navigation/MonsterSubNav.vue b/src/views/navigation/MonsterSubNav.vue
index 5459a3f..b263459 100644
--- a/src/views/navigation/MonsterSubNav.vue
+++ b/src/views/navigation/MonsterSubNav.vue
@@ -1,15 +1,15 @@
 <script setup lang="ts">
   import { ref, watchEffect, } from 'vue'
-  import { getMonster, type Monster, } from '@/scripts/sources/monster.ts';
-  import { getMonsterSkillsByIds, MonsterSkill, } from '@/scripts/sources/monsterskill';
-  import { getCharacterByMonster, Character } from '@/scripts/sources/character';
-  import { AbilityContextType } from '@/scripts/sources/ability';
+  import { getMonster, type Monster, } from '@/sources/monster.ts';
+  import { getMonsterSkillsByIds, MonsterSkill, } from '@/sources/monsterskill';
+  import { getCharacterByMonster, Character } from '@/sources/character';
+  import { TaskContextType } from '@/sources/ability';
   import CharacterSkillAbilitiesNav from './CharacterSkillAbilitiesNav.vue';
   import CharacterOtherAbilitiesNav from './CharacterOtherAbilitiesNav.vue';
   import CharacterModifiers from './CharacterModifiers.vue';
   import NavTree from '@/components/NavTree.vue'
   import NavItem from '@/components/NavItem.vue'
-  import LoadingNav from '../LoadingNav.vue';
+  import LoadingNav from '@/components/LoadingNav.vue';
 
   const props = defineProps<{commitId:string, objectId:number}>()
 
@@ -71,7 +71,7 @@
       <NavItem v-if="character">
         <NavTree>
           <template #header>Modifiers</template>
-          <CharacterModifiers :character="character" :abilityContextType="AbilityContextType.Monster" v-slot="slotProps">
+          <CharacterModifiers :character="character" :taskContextType="TaskContextType.Monster" v-slot="slotProps">
             <RouterLink :to="{ name:'monsterModifier', params:{ commitId: commitId, objectId: objectId, modifierId: slotProps.modifier, }}">
               {{ slotProps.modifier }}
             </RouterLink>
diff --git a/src/views/navigation/RelicSetNav.vue b/src/views/navigation/RelicSetNav.vue
index 8f713e3..dcec313 100644
--- a/src/views/navigation/RelicSetNav.vue
+++ b/src/views/navigation/RelicSetNav.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
   import { ref, computed, inject, Ref, } from 'vue'
   import { RouterLink } from 'vue-router';
-  import { getRelicSets, RelicSet, RelicSetConfig, } from '@/scripts/sources/relicset';
+  import { getRelicSets, RelicSet, RelicSetConfig, } from '@/sources/relicset';
   import NavItem from '@/components/NavItem.vue'
 
   const commitId = inject<string>('commitId') as string
diff --git a/src/views/navigation/RelicSetSubNav.vue b/src/views/navigation/RelicSetSubNav.vue
index 192e344..c62d9d0 100644
--- a/src/views/navigation/RelicSetSubNav.vue
+++ b/src/views/navigation/RelicSetSubNav.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
   import { ref, watchEffect, } from 'vue'
-  import { getRelicSet, RelicSet, } from '@/scripts/sources/relicset';
+  import { getRelicSet, RelicSet, } from '@/sources/relicset';
   import NavTree from '@/components/NavTree.vue'
   import NavItem from '@/components/NavItem.vue'
-  import LoadingNav from '../LoadingNav.vue';
+  import LoadingNav from '@/components/LoadingNav.vue';
 
   const props = defineProps<{commitId:string, objectId:number}>()
 
diff --git a/src/views/navigation/StatusNav.vue b/src/views/navigation/StatusNav.vue
index c3639a3..aba4708 100644
--- a/src/views/navigation/StatusNav.vue
+++ b/src/views/navigation/StatusNav.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
   import { ref, computed, inject, Ref, } from 'vue'
   import { RouterLink } from 'vue-router';
-  import { getStatuses, Status, StatusConfig, } from '@/scripts/sources/status';
+  import { getStatuses, Status, StatusConfig, } from '@/sources/status';
   import NavItem from '@/components/NavItem.vue'
 
   const commitId = inject<string>('commitId') as string
diff --git a/src/views/navigation/StatusSubNav.vue b/src/views/navigation/StatusSubNav.vue
index 6333006..2a1961b 100644
--- a/src/views/navigation/StatusSubNav.vue
+++ b/src/views/navigation/StatusSubNav.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
   import { ref, watchEffect, } from 'vue'
-  import { getStatus, Status, } from '@/scripts/sources/status';
+  import { getStatus, Status, } from '@/sources/status';
   import NavTree from '@/components/NavTree.vue'
   import NavItem from '@/components/NavItem.vue'
-  import LoadingNav from '../LoadingNav.vue';
+  import LoadingNav from '@/components/LoadingNav.vue';
 
   const props = defineProps<{commitId:string, objectId:number}>()
 
diff --git a/vite.config.ts b/vite.config.ts
index 9241e9d..e501395 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -7,9 +7,9 @@ import path from 'path'
 // https://vitejs.dev/config/
 export default defineConfig(async ({ command, mode, ssrBuild }) => 
 {
-  const gamecoreFiles = await readdir(`${path.resolve(__dirname, 'src')}/views/gamecore/blocks/`)
-  const gamecorePaths = gamecoreFiles.map(f => `./src/views/gamecore/blocks/${f}`)
-  gamecorePaths.push('./src/views/gamecore/MissingBlock.vue')
+  const gamecoreFiles = await readdir(`${path.resolve(__dirname, 'src')}/gamecore/tasks/`)
+  const gamecorePaths = gamecoreFiles.map(f => `./src/gamecore/tasks/${f}`)
+  gamecorePaths.push('./src/gamecore/MissingTask.vue')
 
   console.log(gamecorePaths)
   return {
@@ -29,7 +29,7 @@ export default defineConfig(async ({ command, mode, ssrBuild }) =>
         output: 
         {
           // https://rollupjs.org/guide/en/#outputmanualchunks
-          manualChunks: { 'gamecore': gamecorePaths, },
+          manualChunks: { 'tasks': gamecorePaths, },
         },
       },
     },