diff --git a/npc/core/src/main/scala/ALU.scala b/npc/core/src/main/scala/components/ALU.scala
similarity index 100%
rename from npc/core/src/main/scala/ALU.scala
rename to npc/core/src/main/scala/components/ALU.scala
diff --git a/npc/core/src/main/scala/Mem.scala b/npc/core/src/main/scala/components/Mem.scala
similarity index 100%
rename from npc/core/src/main/scala/Mem.scala
rename to npc/core/src/main/scala/components/Mem.scala
diff --git a/npc/core/src/main/scala/ProgramCounter.scala b/npc/core/src/main/scala/components/ProgramCounter.scala
similarity index 100%
rename from npc/core/src/main/scala/ProgramCounter.scala
rename to npc/core/src/main/scala/components/ProgramCounter.scala
diff --git a/npc/core/src/main/scala/RegisterFile.scala b/npc/core/src/main/scala/components/RegisterFile.scala
similarity index 100%
rename from npc/core/src/main/scala/RegisterFile.scala
rename to npc/core/src/main/scala/components/RegisterFile.scala
diff --git a/npc/core/src/main/scala/FlowMain.scala b/npc/core/src/main/scala/top/FlowMain.scala
similarity index 100%
rename from npc/core/src/main/scala/FlowMain.scala
rename to npc/core/src/main/scala/top/FlowMain.scala
diff --git a/npc/core/src/main/scala/Keyboard.scala b/npc/core/src/main/scala/utils/Keyboard.scala
similarity index 100%
rename from npc/core/src/main/scala/Keyboard.scala
rename to npc/core/src/main/scala/utils/Keyboard.scala
diff --git a/npc/core/src/main/scala/SegControllerGenerator.scala b/npc/core/src/main/scala/utils/SegControllerGenerator.scala
similarity index 100%
rename from npc/core/src/main/scala/SegControllerGenerator.scala
rename to npc/core/src/main/scala/utils/SegControllerGenerator.scala