Small source movements (ccn_* to ccn/). Small change of NameBuilder implementation

diff --git a/model/ndn_contentpacket.h b/model/ndn_contentpacket.h
index 6e7a2e3..bd8abd0 100644
--- a/model/ndn_contentpacket.h
+++ b/model/ndn_contentpacket.h
@@ -23,7 +23,7 @@
 
 #include "ns3/header.h"
 #include <ns3/packet.h>
-#include "ccn_ccn.h"
+#include "ccn/ccn.h"
 
 namespace ns3
 {