diff --git a/client/makefile b/client/makefile
index c8e02d8..06f6b50 100644
--- a/client/makefile
+++ b/client/makefile
@@ -1,5 +1,5 @@
 #config
-COMMONDIR+=../common
+COMMONDIR+=../common ../common/mapsystem
 COMMON+=../libcommon.a
 LIB+=$(COMMON) -lmingw32 -lSDLmain -lSDL -llua -lsqlite3
 CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(COMMONDIR))
diff --git a/common/makefile b/common/makefile
index 9e3df4a..0d0176e 100644
--- a/common/makefile
+++ b/common/makefile
@@ -19,6 +19,7 @@ OUT=$(addprefix $(OUTDIR)/,libcommon.a)
 #targets
 all: $(OBJ) $(OUT)
 	ar -crs $(OUT) $(OBJ)
+	$(MAKE) -C mapsystem
 
 $(OBJ): | $(OBJDIR)
 
diff --git a/common/mapsystem/makefile b/common/mapsystem/makefile
new file mode 100644
index 0000000..85c3910
--- /dev/null
+++ b/common/mapsystem/makefile
@@ -0,0 +1,44 @@
+#config
+COMMONDIR+=..
+COMMON+=../../libcommon.a
+LIB+=
+CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(COMMONDIR))
+CFLAGS+=-DDEBUG $(addprefix -I,$(COMMONDIR))
+
+#source
+CXXSRC=$(wildcard *.cpp)
+CSRC=$(wildcard *.c)
+
+#objects
+OBJDIR=obj
+OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
+OBJ+=$(addprefix $(OBJDIR)/,$(CSRC:.c=.o))
+
+#output
+OUTDIR=../..
+OUT=$(addprefix $(OUTDIR)/,libcommon.a)
+
+#targets
+all: $(OBJ) $(OUT)
+	ar -crs $(OUT) $(OBJ)
+
+$(OBJ): | $(OBJDIR)
+
+$(OUT): | $(OUTDIR)
+
+$(OBJDIR):
+	mkdir $(OBJDIR)
+
+$(OUTDIR):
+	mkdir $(OUTDIR)
+
+$(OBJDIR)/%.o: %.cpp
+	$(CXX) $(CXXFLAGS) -c -o $@ $<
+
+$(OBJDIR)/%.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+clean:
+	$(RM) *.o *.a *.exe
+
+rebuild: clean all
diff --git a/common/map_loader.cpp b/common/mapsystem/map_loader.cpp
similarity index 100%
rename from common/map_loader.cpp
rename to common/mapsystem/map_loader.cpp
diff --git a/common/map_loader.hpp b/common/mapsystem/map_loader.hpp
similarity index 100%
rename from common/map_loader.hpp
rename to common/mapsystem/map_loader.hpp
diff --git a/common/region.cpp b/common/mapsystem/region.cpp
similarity index 100%
rename from common/region.cpp
rename to common/mapsystem/region.cpp
diff --git a/common/region.hpp b/common/mapsystem/region.hpp
similarity index 100%
rename from common/region.hpp
rename to common/mapsystem/region.hpp
diff --git a/common/region_pager.cpp b/common/mapsystem/region_pager.cpp
similarity index 100%
rename from common/region_pager.cpp
rename to common/mapsystem/region_pager.cpp
diff --git a/common/region_pager.hpp b/common/mapsystem/region_pager.hpp
similarity index 100%
rename from common/region_pager.hpp
rename to common/mapsystem/region_pager.hpp
diff --git a/common/tile.cpp b/common/mapsystem/tile.cpp
similarity index 100%
rename from common/tile.cpp
rename to common/mapsystem/tile.cpp
diff --git a/common/tile.hpp b/common/mapsystem/tile.hpp
similarity index 100%
rename from common/tile.hpp
rename to common/mapsystem/tile.hpp
diff --git a/common/tile_sheet.cpp b/common/mapsystem/tile_sheet.cpp
similarity index 100%
rename from common/tile_sheet.cpp
rename to common/mapsystem/tile_sheet.cpp
diff --git a/common/tile_sheet.hpp b/common/mapsystem/tile_sheet.hpp
similarity index 100%
rename from common/tile_sheet.hpp
rename to common/mapsystem/tile_sheet.hpp
diff --git a/editor/makefile b/editor/makefile
index 50fd18a..c194503 100644
--- a/editor/makefile
+++ b/editor/makefile
@@ -1,5 +1,5 @@
 #config
-COMMONDIR+=../common
+COMMONDIR+=../common ../common/mapsystem
 COMMON+=../libcommon.a
 LIB+=$(COMMON) -lmingw32 -lSDLmain -lSDL -llua -lsqlite3
 CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(COMMONDIR))
diff --git a/server/makefile b/server/makefile
index 840f805..0948f34 100644
--- a/server/makefile
+++ b/server/makefile
@@ -1,5 +1,5 @@
 #config
-COMMONDIR+=../common
+COMMONDIR+=../common ../common/mapsystem
 COMMON+=../libcommon.a
 LIB+=$(COMMON) -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua -lsqlite3
 CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(COMMONDIR))