diff --git a/exynos4/ril/Android.mk b/exynos4/ril/Android.mk
deleted file mode 100644
index f0b7ec0..0000000
--- a/exynos4/ril/Android.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright (C) 2012 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-ifeq ($(TARGET_BOARD_PLATFORM),exynos4)
-ril_dirs := libsecril-client libsecril-client-sap
-include $(call all-named-subdir-makefiles,$(ril_dirs))
-endif
diff --git a/ril/Android.mk b/ril/Android.mk
index 938bbde..2baf6e6 100644
--- a/ril/Android.mk
+++ b/ril/Android.mk
@@ -17,16 +17,20 @@
 LOCAL_PATH := $(call my-dir)
 
 ifeq ($(BOARD_VENDOR),samsung)
-ifeq ($(BOARD_PROVIDES_LIBRIL),true)
 
+# libril
+ifeq ($(BOARD_PROVIDES_LIBRIL),true)
 ifeq ($(BOARD_MODEM_TYPE),xmm6260)
 include $(LOCAL_PATH)/xmm6260/libril/Android.mk
 endif
-
 ifeq ($(BOARD_MODEM_TYPE),xmm6262)
 include $(LOCAL_PATH)/xmm6262/libril/Android.mk
 endif
-
 endif
+
+# ril client
+client_dirs := libsecril-client libsecril-client-sap
+include $(call all-named-subdir-makefiles,$(client_dirs))
+
 endif
 
diff --git a/exynos4/ril/libsecril-client-sap/Android.mk b/ril/libsecril-client-sap/Android.mk
similarity index 100%
rename from exynos4/ril/libsecril-client-sap/Android.mk
rename to ril/libsecril-client-sap/Android.mk
diff --git a/exynos4/ril/libsecril-client-sap/MODULE_LICENSE_APACHE2 b/ril/libsecril-client-sap/MODULE_LICENSE_APACHE2
similarity index 100%
rename from exynos4/ril/libsecril-client-sap/MODULE_LICENSE_APACHE2
rename to ril/libsecril-client-sap/MODULE_LICENSE_APACHE2
diff --git a/exynos4/ril/libsecril-client-sap/NOTICE b/ril/libsecril-client-sap/NOTICE
similarity index 100%
rename from exynos4/ril/libsecril-client-sap/NOTICE
rename to ril/libsecril-client-sap/NOTICE
diff --git a/exynos4/ril/libsecril-client-sap/secril-client-sap.cpp b/ril/libsecril-client-sap/secril-client-sap.cpp
similarity index 100%
rename from exynos4/ril/libsecril-client-sap/secril-client-sap.cpp
rename to ril/libsecril-client-sap/secril-client-sap.cpp
diff --git a/exynos4/ril/libsecril-client-sap/secril-client-sap.h b/ril/libsecril-client-sap/secril-client-sap.h
similarity index 100%
rename from exynos4/ril/libsecril-client-sap/secril-client-sap.h
rename to ril/libsecril-client-sap/secril-client-sap.h
diff --git a/exynos4/ril/libsecril-client/Android.mk b/ril/libsecril-client/Android.mk
similarity index 100%
rename from exynos4/ril/libsecril-client/Android.mk
rename to ril/libsecril-client/Android.mk
diff --git a/exynos4/ril/libsecril-client/secril-client.cpp b/ril/libsecril-client/secril-client.cpp
similarity index 100%
rename from exynos4/ril/libsecril-client/secril-client.cpp
rename to ril/libsecril-client/secril-client.cpp
diff --git a/exynos4/ril/libsecril-client/secril-client.h b/ril/libsecril-client/secril-client.h
similarity index 100%
rename from exynos4/ril/libsecril-client/secril-client.h
rename to ril/libsecril-client/secril-client.h
diff --git a/exynos4/ril/secril_multi/Oem_ril_sap.h b/ril/secril_multi/Oem_ril_sap.h
similarity index 100%
rename from exynos4/ril/secril_multi/Oem_ril_sap.h
rename to ril/secril_multi/Oem_ril_sap.h