15 files changed, 22 insertions, 22 deletions
diff --git a/Android.mk b/Android.mk
index cca4bb7..72bc510 100644
--- a/Android.mk
+++ b/Android.mk
@@ -53,11 +53,11 @@ libsamsung_ipc_local_src_files := \
 	samsung-ipc/ipc.c \
 	samsung-ipc/ipc_devices.c \
 	samsung-ipc/ipc_utils.c \
-	samsung-ipc/devices/xmm616/xmm616.c \
-	samsung-ipc/devices/xmm626/xmm626.c \
-	samsung-ipc/devices/xmm626/xmm626_hsic.c \
-	samsung-ipc/devices/xmm626/xmm626_mipi.c \
-	samsung-ipc/devices/xmm626/xmm626_sec_modem.c \
+	samsung-ipc/modems/xmm616/xmm616.c \
+	samsung-ipc/modems/xmm626/xmm626.c \
+	samsung-ipc/modems/xmm626/xmm626_hsic.c \
+	samsung-ipc/modems/xmm626/xmm626_mipi.c \
+	samsung-ipc/modems/xmm626/xmm626_sec_modem.c \
 	samsung-ipc/devices/crespo/crespo.c \
 	samsung-ipc/devices/aries/aries.c \
 	samsung-ipc/devices/galaxys2/galaxys2.c \
@@ -80,8 +80,8 @@ libsamsung_ipc_local_src_files := \
 libsamsung_ipc_local_c_includes := \
 	$(LOCAL_PATH)/include \
 	$(LOCAL_PATH)/samsung-ipc \
-	$(LOCAL_PATH)/samsung-ipc/devices/xmm616/ \
-	$(LOCAL_PATH)/samsung-ipc/devices/xmm626/ \
+	$(LOCAL_PATH)/samsung-ipc/modems/xmm616/ \
+	$(LOCAL_PATH)/samsung-ipc/modems/xmm626/ \
 	external/openssl/include
 
 libsamsung_local_cflags := \
diff --git a/samsung-ipc/Makefile.am b/samsung-ipc/Makefile.am
index ed65c29..6ab058d 100644
--- a/samsung-ipc/Makefile.am
+++ b/samsung-ipc/Makefile.am
@@ -3,8 +3,8 @@ NULL =
 AM_CFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/samsung-ipc \
-	-I$(top_srcdir)/samsung-ipc/devices/xmm616 \
-	-I$(top_srcdir)/samsung-ipc/devices/xmm626 \
+	-I$(top_srcdir)/samsung-ipc/modems/xmm616 \
+	-I$(top_srcdir)/samsung-ipc/modems/xmm626 \
 	$(OPENSSL_CFLAGS) \
 	$(NULL)
 
@@ -22,19 +22,19 @@ libsamsung_ipc_la_SOURCES = \
 	ipc_devices.c \
 	ipc_devices.h \
 	ipc_utils.c \
-	devices/xmm616/xmm616.c \
-	devices/xmm616/xmm616.h \
-	devices/xmm626/xmm626.c \
-	devices/xmm626/xmm626.h \
-	devices/xmm626/xmm626_hsic.c \
-	devices/xmm626/xmm626_hsic.h \
-	devices/xmm626/xmm626_mipi.c \
-	devices/xmm626/xmm626_mipi.h \
-	devices/xmm626/xmm626_sec_modem.c \
-	devices/xmm626/xmm626_sec_modem.h \
-	devices/xmm626/modem.h \
-	devices/xmm626/modem_link_device_hsic.h \
-	devices/xmm626/modem_prj.h \
+	modems/xmm616/xmm616.c \
+	modems/xmm616/xmm616.h \
+	modems/xmm626/xmm626.c \
+	modems/xmm626/xmm626.h \
+	modems/xmm626/xmm626_hsic.c \
+	modems/xmm626/xmm626_hsic.h \
+	modems/xmm626/xmm626_mipi.c \
+	modems/xmm626/xmm626_mipi.h \
+	modems/xmm626/xmm626_sec_modem.c \
+	modems/xmm626/xmm626_sec_modem.h \
+	modems/xmm626/modem.h \
+	modems/xmm626/modem_link_device_hsic.h \
+	modems/xmm626/modem_prj.h \
 	devices/crespo/crespo.c \
 	devices/crespo/crespo.h \
 	devices/crespo/crespo_modem_ctl.h \
diff --git a/samsung-ipc/devices/xmm616/xmm616.c b/samsung-ipc/modems/xmm616/xmm616.c
index cf06f5e..cf06f5e 100644
--- a/samsung-ipc/devices/xmm616/xmm616.c
+++ b/samsung-ipc/modems/xmm616/xmm616.c
diff --git a/samsung-ipc/devices/xmm616/xmm616.h b/samsung-ipc/modems/xmm616/xmm616.h
index eb3a21b..eb3a21b 100644
--- a/samsung-ipc/devices/xmm616/xmm616.h
+++ b/samsung-ipc/modems/xmm616/xmm616.h
diff --git a/samsung-ipc/devices/xmm626/modem.h b/samsung-ipc/modems/xmm626/modem.h
index 150bd8a..150bd8a 100644
--- a/samsung-ipc/devices/xmm626/modem.h
+++ b/samsung-ipc/modems/xmm626/modem.h
diff --git a/samsung-ipc/devices/xmm626/modem_link_device_hsic.h b/samsung-ipc/modems/xmm626/modem_link_device_hsic.h
index a8acca8..a8acca8 100755
--- a/samsung-ipc/devices/xmm626/modem_link_device_hsic.h
+++ b/samsung-ipc/modems/xmm626/modem_link_device_hsic.h
diff --git a/samsung-ipc/devices/xmm626/modem_prj.h b/samsung-ipc/modems/xmm626/modem_prj.h
index 99f6087..99f6087 100644
--- a/samsung-ipc/devices/xmm626/modem_prj.h
+++ b/samsung-ipc/modems/xmm626/modem_prj.h
diff --git a/samsung-ipc/devices/xmm626/xmm626.c b/samsung-ipc/modems/xmm626/xmm626.c
index 0c6846d..0c6846d 100644
--- a/samsung-ipc/devices/xmm626/xmm626.c
+++ b/samsung-ipc/modems/xmm626/xmm626.c
diff --git a/samsung-ipc/devices/xmm626/xmm626.h b/samsung-ipc/modems/xmm626/xmm626.h
index 866b36c..866b36c 100644
--- a/samsung-ipc/devices/xmm626/xmm626.h
+++ b/samsung-ipc/modems/xmm626/xmm626.h
diff --git a/samsung-ipc/devices/xmm626/xmm626_hsic.c b/samsung-ipc/modems/xmm626/xmm626_hsic.c
index 30ade46..30ade46 100644
--- a/samsung-ipc/devices/xmm626/xmm626_hsic.c
+++ b/samsung-ipc/modems/xmm626/xmm626_hsic.c
diff --git a/samsung-ipc/devices/xmm626/xmm626_hsic.h b/samsung-ipc/modems/xmm626/xmm626_hsic.h
index b35e1ba..b35e1ba 100644
--- a/samsung-ipc/devices/xmm626/xmm626_hsic.h
+++ b/samsung-ipc/modems/xmm626/xmm626_hsic.h
diff --git a/samsung-ipc/devices/xmm626/xmm626_mipi.c b/samsung-ipc/modems/xmm626/xmm626_mipi.c
index 813e8d7..813e8d7 100644
--- a/samsung-ipc/devices/xmm626/xmm626_mipi.c
+++ b/samsung-ipc/modems/xmm626/xmm626_mipi.c
diff --git a/samsung-ipc/devices/xmm626/xmm626_mipi.h b/samsung-ipc/modems/xmm626/xmm626_mipi.h
index 4d389df..4d389df 100644
--- a/samsung-ipc/devices/xmm626/xmm626_mipi.h
+++ b/samsung-ipc/modems/xmm626/xmm626_mipi.h
diff --git a/samsung-ipc/devices/xmm626/xmm626_sec_modem.c b/samsung-ipc/modems/xmm626/xmm626_sec_modem.c
index faeacb9..faeacb9 100644
--- a/samsung-ipc/devices/xmm626/xmm626_sec_modem.c
+++ b/samsung-ipc/modems/xmm626/xmm626_sec_modem.c
diff --git a/samsung-ipc/devices/xmm626/xmm626_sec_modem.h b/samsung-ipc/modems/xmm626/xmm626_sec_modem.h
index 9599a84..9599a84 100644
--- a/samsung-ipc/devices/xmm626/xmm626_sec_modem.h
+++ b/samsung-ipc/modems/xmm626/xmm626_sec_modem.h