diff --git a/Makefile b/Makefile
index e8e68d2..29de765 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ TARGET		= httpd
 
 # which modules (subdirectories) of the project to include in compiling
 #MODULES		= driver user lwip/api lwip/app lwip/core lwip/core/ipv4 lwip/netif
-MODULES		= espfs user
+MODULES		= espfs httpd user
 EXTRA_INCDIR	= include \
 		. \
 		lib/heatshrink/
diff --git a/user/auth.c b/httpd/auth.c
similarity index 100%
rename from user/auth.c
rename to httpd/auth.c
diff --git a/user/auth.h b/httpd/auth.h
similarity index 100%
rename from user/auth.h
rename to httpd/auth.h
diff --git a/user/base64.c b/httpd/base64.c
similarity index 100%
rename from user/base64.c
rename to httpd/base64.c
diff --git a/user/base64.h b/httpd/base64.h
similarity index 100%
rename from user/base64.h
rename to httpd/base64.h
diff --git a/user/httpd.c b/httpd/httpd.c
similarity index 100%
rename from user/httpd.c
rename to httpd/httpd.c
diff --git a/user/httpd.h b/httpd/httpd.h
similarity index 100%
rename from user/httpd.h
rename to httpd/httpd.h
diff --git a/user/httpdespfs.c b/httpd/httpdespfs.c
similarity index 100%
rename from user/httpdespfs.c
rename to httpd/httpdespfs.c
diff --git a/user/httpdespfs.h b/httpd/httpdespfs.h
similarity index 100%
rename from user/httpdespfs.h
rename to httpd/httpdespfs.h