diff --git a/CMakeModules/Install.cmake b/CMakeModules/Install.cmake
index 08f0f3f..756810f 100644
--- a/CMakeModules/Install.cmake
+++ b/CMakeModules/Install.cmake
@@ -17,7 +17,7 @@ install(DIRECTORY "${CMAKE_BINARY_DIR}/include/"
 
 #
 # Install CMake Config file
-configure_file(${CMAKE_MODULE_PATH}/LibWebRTCConfig.cmake.in
+configure_file(${CMAKE_MODULE_PATH}/Templates/LibWebRTCConfig.cmake.in
                ${CMAKE_BINARY_DIR}/LibWebRTCConfig.cmake @ONLY)
 install(FILES ${CMAKE_BINARY_DIR}/LibWebRTCConfig.cmake
         DESTINATION ${INSTALL_CMAKE_DIR}
@@ -25,7 +25,7 @@ install(FILES ${CMAKE_BINARY_DIR}/LibWebRTCConfig.cmake
 
 #
 # Install CMake ConfigVersion file
-configure_file(${CMAKE_MODULE_PATH}/LibWebRTCConfigVersion.cmake.in
+configure_file(${CMAKE_MODULE_PATH}/Templates/LibWebRTCConfigVersion.cmake.in
                ${CMAKE_BINARY_DIR}/LibWebRTCConfigVersion.cmake @ONLY)
 install(FILES ${CMAKE_BINARY_DIR}/LibWebRTCConfigVersion.cmake
         DESTINATION ${INSTALL_CMAKE_DIR}
@@ -34,7 +34,7 @@ install(FILES ${CMAKE_BINARY_DIR}/LibWebRTCConfigVersion.cmake
 #
 # Install pkg-config file
 if (UNIX)
-  configure_file(${CMAKE_MODULE_PATH}/LibWebRTC.pc.in
+  configure_file(${CMAKE_MODULE_PATH}/Templates/LibWebRTC.pc.in
                  ${CMAKE_BINARY_DIR}/LibWebRTC.pc @ONLY)
   install(FILES ${CMAKE_BINARY_DIR}/LibWebRTC.pc
           DESTINATION ${INSTALL_PKGCONFIG_DIR}
@@ -43,7 +43,7 @@ endif (UNIX)
 
 #
 # Install CMake Use file
-install(FILES ${CMAKE_MODULE_PATH}/UseLibWebRTC.cmake
+install(FILES ${CMAKE_MODULE_PATH}/Templates/UseLibWebRTC.cmake
         DESTINATION ${INSTALL_CMAKE_DIR}
         COMPONENT cmake)
 
@@ -57,7 +57,7 @@ install(DIRECTORY "${CMAKE_BINARY_DIR}/lib/cmake/LibWebRTC/"
 #
 # Add uninstall target
 configure_file(
-    "${CMAKE_MODULE_PATH}/Uninstall.cmake.in"
+    "${CMAKE_MODULE_PATH}/Templates/Uninstall.cmake.in"
     "${CMAKE_BINARY_DIR}/Uninstall.cmake"
     IMMEDIATE @ONLY)
 
diff --git a/CMakeModules/LibWebRTC.pc.in b/CMakeModules/LibWebRTC.pc.in
deleted file mode 100644
index 5e1a332..0000000
--- a/CMakeModules/LibWebRTC.pc.in
+++ /dev/null
@@ -1,5 +0,0 @@
-Name: LibWebRTC
-Description: Google's native WebRTC implementation shipped into a single library
-Version: @LIBWEBRTC_VERSION@
-Libs: -L@INSTALL_LIB_DIR@ -std=gnu++0x -lSM -lICE -lX11 -lXext -ldl -pthread -lwebrtc
-Cflags: -I@INSTALL_INCLUDE_DIR@ -DWEBRTC_POSIX -std=gnu++0x -D_GLIBCXX_USE_CXX11_ABI=0
diff --git a/CMakeModules/Templates/LibWebRTC.pc.in b/CMakeModules/Templates/LibWebRTC.pc.in
new file mode 100644
index 0000000..464794c
--- /dev/null
+++ b/CMakeModules/Templates/LibWebRTC.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: LibWebRTC
+Description: Google's native WebRTC implementation shipped into a single library
+Version: @LIBWEBRTC_VERSION@
+Libs: @LIBWEBRTC_PC_LIBS@
+Libs.private: @LIBWEBRTC_PC_LIBS_PRIVATE@
+Cflags: -I${includedir}
\ No newline at end of file
diff --git a/CMakeModules/LibWebRTCConfig.cmake.in b/CMakeModules/Templates/LibWebRTCConfig.cmake.in
similarity index 100%
rename from CMakeModules/LibWebRTCConfig.cmake.in
rename to CMakeModules/Templates/LibWebRTCConfig.cmake.in
diff --git a/CMakeModules/LibWebRTCConfigVersion.cmake.in b/CMakeModules/Templates/LibWebRTCConfigVersion.cmake.in
similarity index 100%
rename from CMakeModules/LibWebRTCConfigVersion.cmake.in
rename to CMakeModules/Templates/LibWebRTCConfigVersion.cmake.in
diff --git a/CMakeModules/Uninstall.cmake.in b/CMakeModules/Templates/Uninstall.cmake.in
similarity index 100%
rename from CMakeModules/Uninstall.cmake.in
rename to CMakeModules/Templates/Uninstall.cmake.in
diff --git a/CMakeModules/UseLibWebRTC.cmake b/CMakeModules/Templates/UseLibWebRTC.cmake
similarity index 100%
rename from CMakeModules/UseLibWebRTC.cmake
rename to CMakeModules/Templates/UseLibWebRTC.cmake