diff --git a/Makefile b/Makefile
index 7655c3e..44a7bd6 100644
--- a/Makefile
+++ b/Makefile
@@ -55,8 +55,8 @@ APPGEN		?= $(SDK_BASE)/tools/gen_appbin.py
 TARGET		= httpd
 
 # which modules (subdirectories) of the project to include in compiling
-MODULES		= user sbmp
-EXTRA_INCDIR	= include libesphttpd/include sbmp
+MODULES		= user sbmp/library
+EXTRA_INCDIR	= include libesphttpd/include sbmp/library
 
 # libraries used in this project, mainly provided by the SDK
 LIBS		= c gcc hal phy pp net80211 wpa main lwip crypto
@@ -194,7 +194,7 @@ all: checkdirs $(TARGET_OUT) $(FW_BASE)
 # 	$(Q) git submodule init
 # 	$(Q) git submodule update
 
-html: 
+html:
 	$(vecho) "Building HTML..."
 	$(Q) ./html_build.sh
 
diff --git a/esp_meas.pro b/esp_meas.pro
index d6f6c64..02e6dc8 100644
--- a/esp_meas.pro
+++ b/esp_meas.pro
@@ -12,7 +12,7 @@ INCLUDEPATH = . \
 	libesphttpd/espfs \
 	libesphttpd/core \
 	libesphttpd/lib/heatshrink \
-	sbmp
+	sbmp/library
 
 SOURCES += \
 	libesphttpd/core/auth.c \
@@ -51,7 +51,7 @@ SOURCES += \
 	sbmp/library/sbmp_bulk.c \
 	user/datalink.c \
 	user/serial.c \
-    user/uptime.c
+	user/uptime.c
 
 HEADERS += \
 	include/uart_hw.h \
@@ -123,8 +123,8 @@ HEADERS += \
 	sbmp/library/sbmp_bulk.h \
 	user/datalink.h \
 	user/serial.h \
-    libesphttpd/include/logging.h \
-    user/uptime.h
+	libesphttpd/include/logging.h \
+	user/uptime.h
 
 DISTFILES += \
 	style.astylerc \