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

diff --git a/model/ndn_stupidinterestgenerator.h b/model/ndn_stupidinterestgenerator.h
index 6407d32..0a8f396 100644
--- a/model/ndn_stupidinterestgenerator.h
+++ b/model/ndn_stupidinterestgenerator.h
@@ -13,7 +13,7 @@
 #include "ns3/nstime.h"
 #include "ns3/event-id.h"
 #include "ns3/ptr.h"
-#include "ccn_ccn.h"
+#include <ccn/ccn.h>
 #include "ns3/udp-socket-factory.h"
 
 namespace ns3 
@@ -75,4 +75,4 @@
 
     };
 //}
-}
\ No newline at end of file
+}