diff --git a/.gitignore b/.gitignore
index dc84959..8b9865b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-build/
+build*/
 
diff --git a/compiler_flags.txt b/compiler_flags.txt
deleted file mode 100644
index a91007d..0000000
--- a/compiler_flags.txt
+++ /dev/null
@@ -1,3 +0,0 @@
--Wall
--lstdc++
--lm
diff --git a/src/atlas.h b/include/atlas.h
similarity index 100%
rename from src/atlas.h
rename to include/atlas.h
diff --git a/src/components.h b/include/components.h
similarity index 100%
rename from src/components.h
rename to include/components.h
diff --git a/src/world.h b/include/world.h
similarity index 100%
rename from src/world.h
rename to include/world.h
diff --git a/makefile b/makefile
deleted file mode 100644
index 1072580..0000000
--- a/makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-CP=clang
-CROSS_CP=x86_64-w64-mingw32-g++
-CFLAGS=$(shell cat compiler_flags.txt | tr '\n' ' ')
-WINCFLAGS=-Wall -lm -Iinclude/windows -lraylib -lopengl32 -lwinmm -lgdi32 -lshell32 -Llib/windows/ -static
-FILES=$(wildcard src/*.cpp)
-
-.PHONY : clean cross-windows all release debug
-
-build/linux/raylib-test-linux-debug: $(FILES)
-	mkdir -p build/linux
-	$(CP) $(FILES) lib/linux/libraylib.a $(CFLAGS) -lX11 -g3 -o build/linux/raylib-test-linux-debug
-
-build/linux/raylib-test-linux-release: $(FILES)
-	mkdir -p build/linux
-	$(CP) $(FILES) $(CFLAGS) -O3 -o build/linux/raylib-test-linux-release
-
-build/windows/raylib-test-windows-debug.exe: $(FILES)
-	mkdir -p build/windows
-	$(CROSS_CP) $(FILES) $(WINCFLAGS) -o build/windows/raylib-test-windows-debug.exe
-
-build/windows/raylib-test-windows-release.exe: $(FILES)
-	mkdir -p build/windows
-	$(CROSS_CP) $(FILES) $(WINCFLAGS) -O3 -o build/windows/raylib-test-windows-release.exe
-
-release: build/linux/raylib-test-linux-release build/windows/raylib-test-windows-release.exe
-
-debug: build/linux/raylib-test-linux-debug build/windows/raylib-test-windows-debug.exe
-
-all: release debug
-
-cross-windows: build/windows/raylib-test-windows-debug.exe
-
-clean :
-	rm -r build/*
diff --git a/meson.build b/meson.build
new file mode 100644
index 0000000..a9be216
--- /dev/null
+++ b/meson.build
@@ -0,0 +1,47 @@
+project('pacman-raylib','cpp')
+
+incdir = include_directories(['third_party/include','include'])
+
+compiler = meson.get_compiler('cpp')
+
+if host_machine.system() == 'windows'
+  raylib_lib = meson.current_source_dir() / 'third_party/lib/windows/libraylib.a'
+  
+  deps = [
+    compiler.find_library('winmm'),
+    compiler.find_library('gdi32'),
+    compiler.find_library('opengl32'),
+    ]
+else
+  raylib_lib = meson.current_source_dir() / 'third_party/lib/linux/libraylib.a'
+  
+  deps = [
+    compiler.find_library('m'),
+    compiler.find_library('dl'),
+    compiler.find_library('pthread'),
+    compiler.find_library('X11'),
+    ]
+endif
+
+src_files = [
+  'src/atlas.cpp',
+  'src/entity.cpp',
+  'src/ghost.cpp',
+  'src/main.cpp',
+  'src/maploader.cpp',
+  'src/pacman.cpp',
+  'src/scorepoint.cpp',
+  'src/wall.cpp',
+  'src/world.cpp',
+  ]
+
+raylib_dep = declare_dependency(
+  include_directories: incdir,
+  link_args: raylib_lib,
+  dependencies: deps
+  )
+
+executable('pacman-raylib',
+          files(src_files),
+          include_directories: incdir,
+          dependencies: [raylib_dep,deps])
diff --git a/src/main.cpp b/src/main.cpp
index 2328ada..1317409 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,12 +1,17 @@
+#include <iostream>
 #include <raylib.h>
 #include <raymath.h>
 #include "world.h"
 
 int main() {	
 	Vector2i window_size = get_map_size("assets/map");
+
+	std::cout << "Starting the window" << std::endl;
 	
 	InitWindow(window_size.x, window_size.y, "Zoomba");
 
+	std::cout << "Window started" << std::endl;
+
 	create_world_with(1./5.);
 	
 	World& world = get_world();
diff --git a/include/windows/config.h b/third_party/include/config.h
similarity index 100%
rename from include/windows/config.h
rename to third_party/include/config.h
diff --git a/include/windows/raylib.h b/third_party/include/raylib.h
similarity index 100%
rename from include/windows/raylib.h
rename to third_party/include/raylib.h
diff --git a/include/windows/raymath.h b/third_party/include/raymath.h
similarity index 100%
rename from include/windows/raymath.h
rename to third_party/include/raymath.h
diff --git a/include/windows/rcamera.h b/third_party/include/rcamera.h
similarity index 100%
rename from include/windows/rcamera.h
rename to third_party/include/rcamera.h
diff --git a/include/windows/rgestures.h b/third_party/include/rgestures.h
similarity index 100%
rename from include/windows/rgestures.h
rename to third_party/include/rgestures.h
diff --git a/include/windows/rlgl.h b/third_party/include/rlgl.h
similarity index 100%
rename from include/windows/rlgl.h
rename to third_party/include/rlgl.h
diff --git a/lib/linux/libraylib.a b/third_party/lib/linux/libraylib.a
similarity index 100%
rename from lib/linux/libraylib.a
rename to third_party/lib/linux/libraylib.a
diff --git a/lib/windows/libraylib.a b/third_party/lib/windows/libraylib.a
similarity index 100%
rename from lib/windows/libraylib.a
rename to third_party/lib/windows/libraylib.a