diff --git a/Makefile.am b/Makefile.am
index 146576d..2d8c223 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -221,8 +221,7 @@ builtin_sources += health/hdp_main.c health/hdp_types.h \
 endif
 
 if GATTMODULES
-builtin_modules += thermometer alert time gatt_example proximity \
-			deviceinfo
+builtin_modules += thermometer alert time gatt_example proximity deviceinfo
 builtin_sources += thermometer/main.c \
 			thermometer/manager.h thermometer/manager.c \
 			thermometer/thermometer.h thermometer/thermometer.c \
@@ -236,9 +235,11 @@ builtin_sources += thermometer/main.c \
 			proximity/reporter.h proximity/reporter.c \
 			proximity/linkloss.h proximity/linkloss.c \
 			proximity/immalert.h proximity/immalert.c \
-			deviceinfo/main.c \
-			deviceinfo/manager.h deviceinfo/manager.c \
-			deviceinfo/deviceinfo.h deviceinfo/deviceinfo.c
+			profiles/deviceinfo/main.c \
+			profiles/deviceinfo/manager.h \
+			profiles/deviceinfo/manager.c \
+			profiles/deviceinfo/deviceinfo.h \
+			profiles/deviceinfo/deviceinfo.c
 endif
 
 
diff --git a/deviceinfo/deviceinfo.c b/profiles/deviceinfo/deviceinfo.c
similarity index 100%
rename from deviceinfo/deviceinfo.c
rename to profiles/deviceinfo/deviceinfo.c
diff --git a/deviceinfo/deviceinfo.h b/profiles/deviceinfo/deviceinfo.h
similarity index 100%
rename from deviceinfo/deviceinfo.h
rename to profiles/deviceinfo/deviceinfo.h
diff --git a/deviceinfo/main.c b/profiles/deviceinfo/main.c
similarity index 100%
rename from deviceinfo/main.c
rename to profiles/deviceinfo/main.c
diff --git a/deviceinfo/manager.c b/profiles/deviceinfo/manager.c
similarity index 100%
rename from deviceinfo/manager.c
rename to profiles/deviceinfo/manager.c
diff --git a/deviceinfo/manager.h b/profiles/deviceinfo/manager.h
similarity index 100%
rename from deviceinfo/manager.h
rename to profiles/deviceinfo/manager.h