7 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index ac5367ab..b75fd0e0 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -5,17 +5,17 @@ include_directories(${CMAKE_SOURCE_DIR}/include)
 include_directories(${CMAKE_BINARY_DIR}/include)
 
 protobuf_generate_c(QOSSPEC_PROTO_SRCS QOSSPEC_PROTO_HDRS
-  qosspec.proto)
+  pb/qos.proto)
 protobuf_generate_c(IPCP_CONFIG_PROTO_SRCS IPCP_CONFIG_PROTO_HDRS
-  ipcp_config.proto)
+  pb/ipcp_config.proto)
 protobuf_generate_c(ENROLL_PROTO_SRCS ENROLL_PROTO_HDRS
-  enroll.proto)
+  pb/enroll.proto)
 protobuf_generate_c(CACEP_PROTO_SRCS CACEP_PROTO_HDRS
-  cacep.proto)
+  pb/cacep.proto)
 protobuf_generate_c(IRM_PROTO_SRCS IRM_PROTO_HDRS
-  irmd_messages.proto)
+  pb/irm.proto)
 protobuf_generate_c(IPCP_PROTO_SRCS IPCP_PROTO_HDRS
-  ipcpd_messages.proto)
+  pb/ipcp.proto)
 
 if (NOT APPLE)
   find_library(LIBRT_LIBRARIES rt)
diff --git a/src/lib/cacep.proto b/src/lib/pb/cacep.proto
index 5d735e33..5d735e33 100644
--- a/src/lib/cacep.proto
+++ b/src/lib/pb/cacep.proto
diff --git a/src/lib/enroll.proto b/src/lib/pb/enroll.proto
index 3b22ac17..3b22ac17 100644
--- a/src/lib/enroll.proto
+++ b/src/lib/pb/enroll.proto
diff --git a/src/lib/ipcpd_messages.proto b/src/lib/pb/ipcp.proto
index c985b752..f3eca0b8 100644
--- a/src/lib/ipcpd_messages.proto
+++ b/src/lib/pb/ipcp.proto
@@ -23,7 +23,7 @@
 syntax = "proto2";
 
 import "ipcp_config.proto";
-import "qosspec.proto";
+import "qos.proto";
 
 enum ipcp_msg_code {
         IPCP_BOOTSTRAP       =  1;
diff --git a/src/lib/ipcp_config.proto b/src/lib/pb/ipcp_config.proto
index 1ff304f1..1ff304f1 100644
--- a/src/lib/ipcp_config.proto
+++ b/src/lib/pb/ipcp_config.proto
diff --git a/src/lib/irmd_messages.proto b/src/lib/pb/irm.proto
index 41ef8595..49afa2e4 100644
--- a/src/lib/irmd_messages.proto
+++ b/src/lib/pb/irm.proto
@@ -23,7 +23,7 @@
 syntax = "proto2";
 
 import "ipcp_config.proto";
-import "qosspec.proto";
+import "qos.proto";
 
 enum irm_msg_code {
         IRM_CREATE_IPCP       =  1;
diff --git a/src/lib/qosspec.proto b/src/lib/pb/qos.proto
index 81d0e4a0..81d0e4a0 100644
--- a/src/lib/qosspec.proto
+++ b/src/lib/pb/qos.proto