diff --git a/src/rewrite/.gitignore b/src/objects/.gitignore
similarity index 100%
rename from src/rewrite/.gitignore
rename to src/objects/.gitignore
diff --git a/src/rewrite/Context.cpp b/src/objects/Context.cpp
similarity index 100%
rename from src/rewrite/Context.cpp
rename to src/objects/Context.cpp
diff --git a/src/rewrite/Context.h b/src/objects/Context.h
similarity index 100%
rename from src/rewrite/Context.h
rename to src/objects/Context.h
diff --git a/src/rewrite/Filter.cpp b/src/objects/Filter.cpp
similarity index 100%
rename from src/rewrite/Filter.cpp
rename to src/objects/Filter.cpp
diff --git a/src/rewrite/Filter.h b/src/objects/Filter.h
similarity index 100%
rename from src/rewrite/Filter.h
rename to src/objects/Filter.h
diff --git a/src/rewrite/Keymap.cpp b/src/objects/Keymap.cpp
similarity index 100%
rename from src/rewrite/Keymap.cpp
rename to src/objects/Keymap.cpp
diff --git a/src/rewrite/Keymap.h b/src/objects/Keymap.h
similarity index 100%
rename from src/rewrite/Keymap.h
rename to src/objects/Keymap.h
diff --git a/src/rewrite/Sequence.cpp b/src/objects/Sequence.cpp
similarity index 100%
rename from src/rewrite/Sequence.cpp
rename to src/objects/Sequence.cpp
diff --git a/src/rewrite/Sequence.h b/src/objects/Sequence.h
similarity index 100%
rename from src/rewrite/Sequence.h
rename to src/objects/Sequence.h
diff --git a/src/rewrite/T.cpp b/src/objects/T.cpp
similarity index 100%
rename from src/rewrite/T.cpp
rename to src/objects/T.cpp
diff --git a/src/rewrite/T.h b/src/objects/T.h
similarity index 100%
rename from src/rewrite/T.h
rename to src/objects/T.h
diff --git a/src/rewrite/TDB.cpp b/src/objects/TDB.cpp
similarity index 100%
rename from src/rewrite/TDB.cpp
rename to src/objects/TDB.cpp
diff --git a/src/rewrite/TDB.h b/src/objects/TDB.h
similarity index 100%
rename from src/rewrite/TDB.h
rename to src/objects/TDB.h
diff --git a/src/rewrite/main.cpp b/src/objects/main.cpp
similarity index 100%
rename from src/rewrite/main.cpp
rename to src/objects/main.cpp
diff --git a/src/rewrite/Makefile b/src/rewrite/Makefile
deleted file mode 100644
index d6518d60f..000000000
--- a/src/rewrite/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-PROJECT = 1.8
-CFLAGS  = -I. -I.. -Wall -pedantic -ggdb3 -fno-rtti -fstack-check
-LFLAGS  = 
-LIBS    = 
-OBJECTS = main.o Context.o TDB.o T.o Sequence.o Filter.o Att.o Keymap.o \
-          Record.o Mod.o StringTable.o ../util.o ../text.o ../Config.o  \
-          ../Date.o
-
-all: $(PROJECT)
-
-install: $(PROJECT)
-	@echo unimplemented
-
-test: $(PROJECT)
-	@echo unimplemented
-
-clean:
-	-rm *.o $(PROJECT)
-
-.cpp.o: $(INCLUDE)
-	g++ -c $(CFLAGS) $<
-
-$(PROJECT): $(OBJECTS)
-	g++ $(OBJECTS) $(LFLAGS) $(LIBS) -o $(PROJECT)
-