diff --git a/.gitignore b/.gitignore
index eca3467..ce65104 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@
 *.orig
 
 # executables
+build
 reflex2q3
 runtests
 
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 9cfd558..0000000
--- a/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-EX=reflex2q3
-CC=g++
-CFLAGS=-static -static-libgcc -static-libstdc++ -I"/mingw64/include/eigen3" -I"include" -I"lib/Catch/single_include/catch2" -I"lib/cxxopts/include" -I"/usr/include/eigen3" -I"/usr/local/include/eigen3"
-TESTEX=runtests
-
-all: main test
-
-main: planes.o brushdef.o oopless-parser.o EntityConverter.o
-	$(CC) $^ src/main.cpp $(CFLAGS) -o $(EX) 
-
-test:  planes.o brushdef.o oopless-parser.o EntityConverter.o catch.o
-	$(CC) $^ $(CFLAGS) -o $(TESTEX)
-	 cp runtests .git/hooks/pre-commit
-
-catch.o: test/catch.cpp
-	$(CC) -c $^ $(CFLAGS)
-
-oopless-parser.o: src/oopless-parser.cpp
-	$(CC) -c $^ $(CFLAGS)
-
-brushdef.o: src/brushdef.cpp
-	$(CC) -c $^ $(CFLAGS)
-
-planes.o: src/planes.cpp
-	$(CC) -c $^ $(CFLAGS)
-
-EntityConverter.o: src/EntityConverter.cpp
-	$(CC) -c $^ $(CFLAGS)
-
-clean:
-	rm *.o $(EX)
-
-# From https://github.com/philsquared/Catch
-#    64a53355..908c370f  Catch1.x                    -> origin/Catch1.x
-#  * [new branch]        devel                       -> origin/devel
-#  * [new branch]        devel-refactorings-virtuals -> origin/devel-refactorings-virtuals
-#  * [new branch]        v2.x                        -> origin/v2.x
-#  * [new tag]           v2.13.10                    -> v2.13.10
-#  * [new tag]           v2.13.2                     -> v2.13.2
-#  * [new tag]           v2.13.3                     -> v2.13.3
-#  * [new tag]           v2.13.4                     -> v2.13.4
-#  * [new tag]           v2.13.5                     -> v2.13.5
-#  * [new tag]           v2.13.6                     -> v2.13.6
-#  * [new tag]           v2.13.7                     -> v2.13.7
-#  * [new tag]           v2.13.8                     -> v2.13.8
-#  * [new tag]           v2.13.9                     -> v2.13.9
-#  * [new tag]           v3.0.0-preview3             -> v3.0.0-preview3
-#  * [new tag]           v3.0.0-preview4             -> v3.0.0-preview4
-#  * [new tag]           v3.0.0-preview5             -> v3.0.0-preview5
-#  * [new tag]           v3.0.1                      -> v3.0.1
-#  * [new tag]           v3.1.0                      -> v3.1.0
-#  * [new tag]           v3.1.1                      -> v3.1.1
-#  * [new tag]           v3.2.0                      -> v3.2.0
-#  * [new tag]           v3.2.1                      -> v3.2.1
-#  * [new tag]           v3.3.0                      -> v3.3.0
-#  * [new tag]           v3.3.1                      -> v3.3.1
-#  * [new tag]           v3.3.2                      -> v3.3.2
diff --git a/README.md b/README.md
index cf0e130..db55a18 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,10 @@ Converts Reflex maps (Version 8 and below) into id Tech map files.
 #### Building:
 ```bash
         git submodule update --init --recursive
-        cmake .; make;
+	mkdir build
+	cd build
+	cmake ..
+	make
 ```
 
 #### Convert map geometry:
@@ -18,7 +21,7 @@ Converts Reflex maps (Version 8 and below) into id Tech map files.
 
 #### Convert map geometry and entities:
 ```bash
-        ./reflex2q3 input.map output.map -e entity-file.rem
+        ./reflex2q3 input.map output.map -e ../entity-file.rem
 ```
 
 We've provided Quake 3 and Xonotic entity conversion files (r2q3.rem and r2xonotic.rem).  To create entity files for other games built on the [id Tech 3](https://en.wikipedia.org/wiki/Id_Tech_3) engine or previous [id Tech](https://en.wikipedia.org/wiki/Id_Tech) engines, refer to our [Reflex entity documentation](https://notabug.org/scuti/reflex2q3/src/master/docs/doc-entities.txt), our sample .rem files, and relevant documentation for your game.
diff --git a/test/catch-entityconverter.cpp b/test/catch-entityconverter.cpp
index fd62051..961b912 100644
--- a/test/catch-entityconverter.cpp
+++ b/test/catch-entityconverter.cpp
@@ -21,7 +21,7 @@
 
 #include "EntityConverter.hpp"
 
-#define ENTITY_FILENAME "r2xonotic.rem"
+#define ENTITY_FILENAME "../r2xonotic.rem"
 #define DELTA 0.00001