diff --git a/Makefile.tools b/Makefile.tools
index 3cb105c..70d333b 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -148,12 +148,16 @@ EXTRA_DIST += tools/dfubabel.1 tools/avctrl.8
 if CUPS
 cupsdir = $(libdir)/cups/backend
 
-cups_PROGRAMS = cups/bluetooth
+cups_PROGRAMS = profiles/cups/bluetooth
 
-cups_bluetooth_SOURCES = $(gdbus_sources) cups/main.c cups/cups.h \
-					cups/sdp.c cups/spp.c cups/hcrp.c
+profiles_cups_bluetooth_SOURCES = $(gdbus_sources) profiles/cups/main.c \
+					profiles/cups/cups.h \
+					profiles/cups/sdp.c \
+					profiles/cups/spp.c \
+					profiles/cups/hcrp.c
 
-cups_bluetooth_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ lib/libbluetooth-private.la
+profiles_cups_bluetooth_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ \
+				lib/libbluetooth-private.la
 endif
 
 
diff --git a/cups/cups.h b/profiles/cups/cups.h
similarity index 100%
rename from cups/cups.h
rename to profiles/cups/cups.h
diff --git a/cups/hcrp.c b/profiles/cups/hcrp.c
similarity index 100%
rename from cups/hcrp.c
rename to profiles/cups/hcrp.c
diff --git a/cups/main.c b/profiles/cups/main.c
similarity index 100%
rename from cups/main.c
rename to profiles/cups/main.c
diff --git a/cups/sdp.c b/profiles/cups/sdp.c
similarity index 100%
rename from cups/sdp.c
rename to profiles/cups/sdp.c
diff --git a/cups/spp.c b/profiles/cups/spp.c
similarity index 100%
rename from cups/spp.c
rename to profiles/cups/spp.c