10 files changed, 7 insertions, 5 deletions
diff --git a/Demos/Host/MassStorageHost/MassStoreCommands.c b/Demos/Host/MassStorageHost/Lib/MassStoreCommands.c
index 95aafca8c..95aafca8c 100644
--- a/Demos/Host/MassStorageHost/MassStoreCommands.c
+++ b/Demos/Host/MassStorageHost/Lib/MassStoreCommands.c
diff --git a/Demos/Host/MassStorageHost/MassStoreCommands.h b/Demos/Host/MassStorageHost/Lib/MassStoreCommands.h
index 28f6a1561..28f6a1561 100644
--- a/Demos/Host/MassStorageHost/MassStoreCommands.h
+++ b/Demos/Host/MassStorageHost/Lib/MassStoreCommands.h
diff --git a/Demos/Host/MassStorageHost/SCSI_Codes.h b/Demos/Host/MassStorageHost/Lib/SCSI_Codes.h
index 2b2213de2..2b2213de2 100644
--- a/Demos/Host/MassStorageHost/SCSI_Codes.h
+++ b/Demos/Host/MassStorageHost/Lib/SCSI_Codes.h
diff --git a/Demos/Host/MassStorageHost/MassStorageHost.h b/Demos/Host/MassStorageHost/MassStorageHost.h
index 1646ad75e..6e1e5cd9e 100644
--- a/Demos/Host/MassStorageHost/MassStorageHost.h
+++ b/Demos/Host/MassStorageHost/MassStorageHost.h
@@ -45,7 +45,8 @@
 		#include <ctype.h>
 
 		#include "ConfigDescriptor.h"
-		#include "MassStoreCommands.h"
+
+		#include "Lib/MassStoreCommands.h"
 
 		#include <LUFA/Version.h>                                // Library Version Information
 		#include <LUFA/Drivers/Misc/TerminalCodes.h>             // ANSI Terminal Escape Codes
diff --git a/Demos/Host/MassStorageHost/makefile b/Demos/Host/MassStorageHost/makefile
index d4792ae40..f50f59887 100644
--- a/Demos/Host/MassStorageHost/makefile
+++ b/Demos/Host/MassStorageHost/makefile
@@ -125,7 +125,7 @@ LUFA_PATH = ../../..
 # List C source files here. (C dependencies are automatically generated.)
 SRC = $(TARGET).c                                                 \
 	  ConfigDescriptor.c                                          \
-	  MassStoreCommands.c                                         \
+	  Lib/MassStoreCommands.c                                     \
 	  $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c                     \
 	  $(LUFA_PATH)/LUFA/Drivers/Peripheral/SerialStream.c         \
 	  $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c               \
diff --git a/Demos/Host/StillImageHost/PIMACodes.h b/Demos/Host/StillImageHost/Lib/PIMACodes.h
index 38755aba8..38755aba8 100644
--- a/Demos/Host/StillImageHost/PIMACodes.h
+++ b/Demos/Host/StillImageHost/Lib/PIMACodes.h
diff --git a/Demos/Host/StillImageHost/StillImageCommands.c b/Demos/Host/StillImageHost/Lib/StillImageCommands.c
index 8f05e48f4..8f05e48f4 100644
--- a/Demos/Host/StillImageHost/StillImageCommands.c
+++ b/Demos/Host/StillImageHost/Lib/StillImageCommands.c
diff --git a/Demos/Host/StillImageHost/StillImageCommands.h b/Demos/Host/StillImageHost/Lib/StillImageCommands.h
index ad0ba55a2..ad0ba55a2 100644
--- a/Demos/Host/StillImageHost/StillImageCommands.h
+++ b/Demos/Host/StillImageHost/Lib/StillImageCommands.h
diff --git a/Demos/Host/StillImageHost/StillImageHost.h b/Demos/Host/StillImageHost/StillImageHost.h
index 909ed89bc..b563767cc 100644
--- a/Demos/Host/StillImageHost/StillImageHost.h
+++ b/Demos/Host/StillImageHost/StillImageHost.h
@@ -43,8 +43,9 @@
 		#include <stdio.h>
 		
 		#include "ConfigDescriptor.h"
-		#include "PIMACodes.h"
-		#include "StillImageCommands.h"
+
+		#include "Lib/PIMACodes.h"
+		#include "Lib/StillImageCommands.h"
 
 		#include <LUFA/Drivers/Misc/TerminalCodes.h>             // ANSI Terminal Escape Codes
 		#include <LUFA/Drivers/USB/USB.h>                        // USB Functionality
diff --git a/Demos/Host/StillImageHost/makefile b/Demos/Host/StillImageHost/makefile
index bcb036f25..8c1ca0b45 100644
--- a/Demos/Host/StillImageHost/makefile
+++ b/Demos/Host/StillImageHost/makefile
@@ -124,7 +124,7 @@ LUFA_PATH = ../../..
 # List C source files here. (C dependencies are automatically generated.)
 SRC = $(TARGET).c                                                 \
 	  ConfigDescriptor.c                                          \
-	  StillImageCommands.c                                        \
+	  Lib/StillImageCommands.c                                    \
 	  $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c                     \
 	  $(LUFA_PATH)/LUFA/Drivers/Peripheral/SerialStream.c         \
 	  $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c               \