diff --git a/src/commands/ApplicationCommand.ts b/src/commands/interface-manager/ApplicationCommand.ts
similarity index 100%
rename from src/commands/ApplicationCommand.ts
rename to src/commands/interface-manager/ApplicationCommand.ts
diff --git a/src/commands/CommandReader.ts b/src/commands/interface-manager/CommandReader.ts
similarity index 99%
rename from src/commands/CommandReader.ts
rename to src/commands/interface-manager/CommandReader.ts
index 1a090fd2..e3c36285 100644
--- a/src/commands/CommandReader.ts
+++ b/src/commands/interface-manager/CommandReader.ts
@@ -4,7 +4,7 @@
  */
 
 import { UserID } from "matrix-bot-sdk";
-import { MatrixRoomReference } from "../models/MatrixRoomReference";
+import { MatrixRoomReference } from "./MatrixRoomReference";
 
 /**
  * Helper for peeking and reading character by character.
diff --git a/src/models/MatrixRoomReference.ts b/src/commands/interface-manager/MatrixRoomReference.ts
similarity index 100%
rename from src/models/MatrixRoomReference.ts
rename to src/commands/interface-manager/MatrixRoomReference.ts
diff --git a/src/commands/Validation.ts b/src/commands/interface-manager/Validation.ts
similarity index 100%
rename from src/commands/Validation.ts
rename to src/commands/interface-manager/Validation.ts
diff --git a/test/commands/CommandReaderTest.ts b/test/commands/CommandReaderTest.ts
index 4570ec88..15133e29 100644
--- a/test/commands/CommandReaderTest.ts
+++ b/test/commands/CommandReaderTest.ts
@@ -1,6 +1,6 @@
 import expect from "expect";
-import { Keyword, readCommand, ReadItem } from "../../src/commands/CommandReader";
-import { MatrixRoomReference } from "../../src/models/MatrixRoomReference";
+import { Keyword, readCommand, ReadItem } from "../../src/commands/interface-manager/CommandReader";
+import { MatrixRoomReference } from "../../src/commands/interface-manager/MatrixRoomReference";
 
 describe("Can read", function() {
     it("Can read a simple command with only strings", function() {