diff --git a/index.html b/index.html
index 3beb0365..a771598e 100644
--- a/index.html
+++ b/index.html
@@ -543,9 +543,9 @@ function require(modname) {
 <script src="gen/ui.js"></script>
 <!-- <script src="src/audio/votrax.js"></script> -->
 <!-- <script src="local/lzg.js"></script> -->
-<script src="gen/nemu/nemu.js"></script>
-<script src="gen/nemu/cpu/MOS6502.js"></script>
-<script src="gen/nemu/machine/apple2.js"></script>
+<script src="gen/devices.js"></script>
+<script src="gen/cpu/MOS6502.js"></script>
+<script src="gen/machine/apple2.js"></script>
 
 <script>
 // submenus open on click + hover
diff --git a/src/nemu/cpu/MOS6502.ts b/src/cpu/MOS6502.ts
similarity index 99%
rename from src/nemu/cpu/MOS6502.ts
rename to src/cpu/MOS6502.ts
index 224ed83b..158de886 100644
--- a/src/nemu/cpu/MOS6502.ts
+++ b/src/cpu/MOS6502.ts
@@ -1,5 +1,5 @@
 
-import { CPU, Bus, ClockBased, SavesState, Interruptable } from "../nemu";
+import { CPU, Bus, ClockBased, SavesState, Interruptable } from "../devices";
 
 // Copyright 2015 by Paulo Augusto Peccin. See license.txt distributed with this file.
 
diff --git a/src/nemu/nemu.ts b/src/devices.ts
similarity index 100%
rename from src/nemu/nemu.ts
rename to src/devices.ts
diff --git a/src/nemu/machine/apple2.ts b/src/machine/apple2.ts
similarity index 99%
rename from src/nemu/machine/apple2.ts
rename to src/machine/apple2.ts
index efed5a0b..99b4aba6 100644
--- a/src/nemu/machine/apple2.ts
+++ b/src/machine/apple2.ts
@@ -1,9 +1,9 @@
 "use strict";
 
 import { MOS6502, MOS6502State } from "../cpu/MOS6502";
-import { Bus, RasterFrameBased, SavesState, AcceptsROM, noise, Resettable, SampledAudioSource, SampledAudioSink } from "../nemu";
-import { KeyFlags } from "../../emu"; // TODO
-import { lzgmini } from "../../util";
+import { Bus, RasterFrameBased, SavesState, AcceptsROM, noise, Resettable, SampledAudioSource, SampledAudioSink } from "../devices";
+import { KeyFlags } from "../emu"; // TODO
+import { lzgmini } from "../util";
 
 const cpuFrequency = 1023000;
 const cpuCyclesPerLine = 65; // approx: http://www.cs.columbia.edu/~sedwards/apple2fpga/
diff --git a/src/platform/apple2.ts b/src/platform/apple2.ts
index 5847a28f..e168af7d 100644
--- a/src/platform/apple2.ts
+++ b/src/platform/apple2.ts
@@ -1068,9 +1068,9 @@ class Apple2MAMEPlatform extends BaseMAMEPlatform implements Platform {
 ///
 
 // TODO: move to own place, debugging
-import { CPU, Bus, ClockBased, SavesState, Interruptable, CPUClockHook } from "../nemu/nemu";
-import { MOS6502 } from "../nemu/cpu/MOS6502";
-import { AppleII } from "../nemu/machine/apple2";
+import { CPU, Bus, ClockBased, SavesState, Interruptable, CPUClockHook } from "../devices";
+import { MOS6502 } from "../cpu/MOS6502";
+import { AppleII } from "../machine/apple2";
 
 class NewApple2Platform extends Base6502Platform implements Platform {