diff --git a/src/pages/Screening/Bus.tsx b/src/pages/Screening/contexts/Bus.tsx
similarity index 100%
rename from src/pages/Screening/Bus.tsx
rename to src/pages/Screening/contexts/Bus.tsx
diff --git a/src/pages/Screening/Runner.tsx b/src/pages/Screening/contexts/Runner.tsx
similarity index 95%
rename from src/pages/Screening/Runner.tsx
rename to src/pages/Screening/contexts/Runner.tsx
index e80bb8d..1515940 100644
--- a/src/pages/Screening/Runner.tsx
+++ b/src/pages/Screening/contexts/Runner.tsx
@@ -2,7 +2,7 @@ import { Node } from "@xyflow/react";
 import Bus from "./Bus";
 import { Emitter } from "mitt";
 
-import * as nodes from "./nodes/";
+import * as nodes from "../nodes/";
 
 export interface Iface {
 };
@@ -39,7 +39,7 @@ async function run(bus: Bus, node: Node) {
 async function execTask(bus: Bus, node: Node, aborted: Promise<void>) {
   switch (node.type) {
   case "fetch_ToshoListed":
-    const data: nodes.fetch.ToshoListedData = node.data;
+    const data: nodes.fetch.ToshoListed = node.data;
     data;
     const sleep = new Promise(resolve => setTimeout(resolve, 1));
     // TODO
diff --git a/src/pages/Screening/index.tsx b/src/pages/Screening/index.tsx
index bd66143..edcaec0 100644
--- a/src/pages/Screening/index.tsx
+++ b/src/pages/Screening/index.tsx
@@ -16,7 +16,7 @@ import * as nodes from "./nodes/";
 
 import "@xyflow/react/dist/style.css";
 
-import Bus, { createBus, BusContext, Events } from "./Bus";
+import Bus, { createBus, BusContext, Events } from "./contexts/Bus";
 
 const nodeTypes = {
   fetch_ToshoListed: nodes.fetch.ToshoListed,
diff --git a/src/pages/Screening/nodes/Base.tsx b/src/pages/Screening/nodes/Base.tsx
index dfb73c2..5b1f163 100644
--- a/src/pages/Screening/nodes/Base.tsx
+++ b/src/pages/Screening/nodes/Base.tsx
@@ -2,7 +2,7 @@ import { useTranslation } from "react-i18next";
 import { ReactNode, useContext, useCallback } from "react";
 import { NodeProps } from "@xyflow/react";
 
-import { BusContext } from "../Bus";
+import { BusContext } from "../contexts/Bus";
 
 import style from "./style.module.scss";
 
diff --git a/src/pages/Screening/nodes/fetch.tsx b/src/pages/Screening/nodes/fetch.tsx
index c0e2b04..1876eb7 100644
--- a/src/pages/Screening/nodes/fetch.tsx
+++ b/src/pages/Screening/nodes/fetch.tsx
@@ -3,7 +3,7 @@ import { useTranslation } from "react-i18next";
 import { Handle, Node, NodeProps, Position } from "@xyflow/react";
 import Base from "./Base";
 
-import { BusContext } from "../Bus";
+import { BusContext } from "../contexts/Bus";
 
 export type ToshoListed = Node<{
   prime: boolean,