diff --git a/server/Inventory/inventory.cpp b/server/inventory/inventory.cpp
similarity index 100%
rename from server/Inventory/inventory.cpp
rename to server/inventory/inventory.cpp
diff --git a/server/Inventory/inventory.hpp b/server/inventory/inventory.hpp
similarity index 100%
rename from server/Inventory/inventory.hpp
rename to server/inventory/inventory.hpp
diff --git a/server/Inventory/inventory_manager.cpp b/server/inventory/inventory_manager.cpp
similarity index 100%
rename from server/Inventory/inventory_manager.cpp
rename to server/inventory/inventory_manager.cpp
diff --git a/server/Inventory/inventory_manager.hpp b/server/inventory/inventory_manager.hpp
similarity index 100%
rename from server/Inventory/inventory_manager.hpp
rename to server/inventory/inventory_manager.hpp
diff --git a/server/Inventory/item_data.cpp b/server/inventory/item_data.cpp
similarity index 100%
rename from server/Inventory/item_data.cpp
rename to server/inventory/item_data.cpp
diff --git a/server/Inventory/item_data.hpp b/server/inventory/item_data.hpp
similarity index 100%
rename from server/Inventory/item_data.hpp
rename to server/inventory/item_data.hpp
diff --git a/server/Inventory/makefile b/server/inventory/makefile
similarity index 100%
rename from server/Inventory/makefile
rename to server/inventory/makefile
diff --git a/server/makefile b/server/makefile
index 02a9386..419f62e 100644
--- a/server/makefile
+++ b/server/makefile
@@ -7,10 +7,12 @@ LIBS+=server.a ../libcommon.a ../libturtlegui.a ../libturtlemap.a -lSDL2_net
 ifeq ($(OS),Windows_NT)
 	LIBS+=-lwsock32 -liphlpapi -lmingw32
 endif
-LIBS+=-lSDL2main -lSDL2 -llua -lsqlite3
+LIBS+=-lSDL2main -lSDL2 -lsqlite3
 ifeq ($(shell uname), Linux)
 	#I don't know what this does, but Ubuntu needs it (dynamic linking for lua)
-	LIBS+=-ldl
+	LIBS+=/usr/local/lib/liblua.a -ldl
+else
+	LIBS+=-llua
 endif
 
 #flags