diff --git a/server/combat/barrier_api.cpp b/server/barriers/barrier_api.cpp
similarity index 100%
rename from server/combat/barrier_api.cpp
rename to server/barriers/barrier_api.cpp
diff --git a/server/combat/barrier_api.hpp b/server/barriers/barrier_api.hpp
similarity index 100%
rename from server/combat/barrier_api.hpp
rename to server/barriers/barrier_api.hpp
diff --git a/server/combat/barrier_data.cpp b/server/barriers/barrier_data.cpp
similarity index 100%
rename from server/combat/barrier_data.cpp
rename to server/barriers/barrier_data.cpp
diff --git a/server/combat/barrier_data.hpp b/server/barriers/barrier_data.hpp
similarity index 100%
rename from server/combat/barrier_data.hpp
rename to server/barriers/barrier_data.hpp
diff --git a/server/combat/barrier_manager.cpp b/server/barriers/barrier_manager.cpp
similarity index 100%
rename from server/combat/barrier_manager.cpp
rename to server/barriers/barrier_manager.cpp
diff --git a/server/combat/barrier_manager.hpp b/server/barriers/barrier_manager.hpp
similarity index 100%
rename from server/combat/barrier_manager.hpp
rename to server/barriers/barrier_manager.hpp
diff --git a/server/combat/barrier_manager_api.cpp b/server/barriers/barrier_manager_api.cpp
similarity index 100%
rename from server/combat/barrier_manager_api.cpp
rename to server/barriers/barrier_manager_api.cpp
diff --git a/server/combat/barrier_manager_api.hpp b/server/barriers/barrier_manager_api.hpp
similarity index 100%
rename from server/combat/barrier_manager_api.hpp
rename to server/barriers/barrier_manager_api.hpp
diff --git a/server/barriers/makefile b/server/barriers/makefile
new file mode 100644
index 0000000..169231d
--- /dev/null
+++ b/server/barriers/makefile
@@ -0,0 +1,32 @@
+#config
+INCLUDES+=. .. ../characters ../creatures ../entities ../inventory ../../common/gameplay ../../common/utilities
+LIBS+=
+CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
+
+#source
+CXXSRC=$(wildcard *.cpp)
+
+#objects
+OBJDIR=obj
+OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
+
+#output
+OUTDIR=..
+OUT=$(addprefix $(OUTDIR)/,server.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 $@ $<
diff --git a/server/characters/makefile b/server/characters/makefile
index 3a0a1cc..a606e12 100644
--- a/server/characters/makefile
+++ b/server/characters/makefile
@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. .. ../combat ../creatures ../entities ../monsters ../inventory ../rooms ../triggers ../../common/gameplay ../../common/map ../../common/network ../../common/network/packet_types ../../common/utilities
+INCLUDES+=. .. ../barriers ../combat ../creatures ../entities ../monsters ../inventory ../rooms ../triggers ../../common/gameplay ../../common/map ../../common/network ../../common/network/packet_types ../../common/utilities
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
diff --git a/server/makefile b/server/makefile
index e31dbf9..553aecf 100644
--- a/server/makefile
+++ b/server/makefile
@@ -1,5 +1,5 @@
 #include directories
-INCLUDES+=. accounts characters clients combat creatures entities inventory rooms triggers ../common/debugging ../common/gameplay ../common/map ../common/network ../common/network/packet_types ../common/utilities
+INCLUDES+=. accounts barriers characters clients combat creatures entities inventory rooms triggers ../common/debugging ../common/gameplay ../common/map ../common/network ../common/network/packet_types ../common/utilities
 
 #libraries
 #the order of the $(LIBS) is important, at least for MinGW
@@ -30,6 +30,7 @@ OUT=$(addprefix $(OUTDIR)/,server)
 #targets
 all: $(OBJ) $(OUT)
 	$(MAKE) -C accounts
+	$(MAKE) -C barriers
 	$(MAKE) -C characters
 	$(MAKE) -C clients
 	$(MAKE) -C combat
diff --git a/server/rooms/makefile b/server/rooms/makefile
index 9b0f275..99dfa02 100644
--- a/server/rooms/makefile
+++ b/server/rooms/makefile
@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. .. ../characters ../combat ../creatures ../entities ../inventory ../monsters ../triggers ../../common/gameplay ../../common/map ../../common/network ../../common/network/packet_types ../../common/utilities
+INCLUDES+=. .. ../barriers ../characters ../combat ../creatures ../entities ../inventory ../monsters ../triggers ../../common/gameplay ../../common/map ../../common/network ../../common/network/packet_types ../../common/utilities
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))