diff --git a/src/util/signal.hpp b/src/util/signal.hpp
index cd36b5d..12f2247 100644
--- a/src/util/signal.hpp
+++ b/src/util/signal.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2014 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2017 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -22,9 +22,9 @@
 #ifndef NDN_UTIL_SIGNAL_HPP
 #define NDN_UTIL_SIGNAL_HPP
 
-#include "signal-signal.hpp"
-#include "signal-emit.hpp"
-#include "signal-connection.hpp"
-#include "signal-scoped-connection.hpp"
+#include "signal/signal.hpp"
+#include "signal/emit.hpp"
+#include "signal/connection.hpp"
+#include "signal/scoped-connection.hpp"
 
 #endif // NDN_UTIL_SIGNAL_HPP
diff --git a/src/util/signal-connection.cpp b/src/util/signal/connection.cpp
similarity index 94%
rename from src/util/signal-connection.cpp
rename to src/util/signal/connection.cpp
index 2d33116..7d46eb1 100644
--- a/src/util/signal-connection.cpp
+++ b/src/util/signal/connection.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2015 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2017 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "signal-connection.hpp"
+#include "connection.hpp"
 
 namespace ndn {
 namespace util {
diff --git a/src/util/signal-connection.hpp b/src/util/signal/connection.hpp
similarity index 96%
rename from src/util/signal-connection.hpp
rename to src/util/signal/connection.hpp
index dbbfd5a..6ee8e1c 100644
--- a/src/util/signal-connection.hpp
+++ b/src/util/signal/connection.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2015 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2017 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -22,7 +22,7 @@
 #ifndef NDN_UTIL_SIGNAL_CONNECTION_HPP
 #define NDN_UTIL_SIGNAL_CONNECTION_HPP
 
-#include "../common.hpp"
+#include "../../common.hpp"
 
 namespace ndn {
 namespace util {
diff --git a/src/util/signal-emit.hpp b/src/util/signal/emit.hpp
similarity index 100%
rename from src/util/signal-emit.hpp
rename to src/util/signal/emit.hpp
diff --git a/src/util/signal-scoped-connection.cpp b/src/util/signal/scoped-connection.cpp
similarity index 94%
rename from src/util/signal-scoped-connection.cpp
rename to src/util/signal/scoped-connection.cpp
index aaed7ab..cbbfaba 100644
--- a/src/util/signal-scoped-connection.cpp
+++ b/src/util/signal/scoped-connection.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2017 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -19,7 +19,7 @@
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
 
-#include "signal-scoped-connection.hpp"
+#include "scoped-connection.hpp"
 
 namespace ndn {
 namespace util {
diff --git a/src/util/signal-scoped-connection.hpp b/src/util/signal/scoped-connection.hpp
similarity index 95%
rename from src/util/signal-scoped-connection.hpp
rename to src/util/signal/scoped-connection.hpp
index 0fe28d4..5c77c2f 100644
--- a/src/util/signal-scoped-connection.hpp
+++ b/src/util/signal/scoped-connection.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2017 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -22,7 +22,7 @@
 #ifndef NDN_UTIL_SIGNAL_SCOPED_CONNECTION_HPP
 #define NDN_UTIL_SIGNAL_SCOPED_CONNECTION_HPP
 
-#include "signal-connection.hpp"
+#include "connection.hpp"
 
 namespace ndn {
 namespace util {
diff --git a/src/util/signal-signal.hpp b/src/util/signal/signal.hpp
similarity index 98%
rename from src/util/signal-signal.hpp
rename to src/util/signal/signal.hpp
index fb5b14b..9b502ab 100644
--- a/src/util/signal-signal.hpp
+++ b/src/util/signal/signal.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2017 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -22,7 +22,7 @@
 #ifndef NDN_UTIL_SIGNAL_SIGNAL_HPP
 #define NDN_UTIL_SIGNAL_SIGNAL_HPP
 
-#include "signal-connection.hpp"
+#include "connection.hpp"
 #include <list>
 
 namespace ndn {