model: Another set of refactoring/renaming to make code compile (not tested yet)

Refs #1005 (http://redmine.named-data.net/)
diff --git a/examples/custom-apps/ndn-api-app.h b/examples/custom-apps/ndn-api-app.h
index 26df590..4e9e487 100644
--- a/examples/custom-apps/ndn-api-app.h
+++ b/examples/custom-apps/ndn-api-app.h
@@ -25,7 +25,7 @@
 #include "ns3/network-module.h"
 #include "ns3/ndnSIM-module.h"
 
-#include "ns3/ndnSIM/ndn.cxx/ndn-handler.h"
+// #include "ns3/ndnSIM/ndn.cxx/ndn-handler.h"
 
 namespace ns3 {
 namespace ndn {
@@ -51,7 +51,7 @@
   StopApplication ();
 
 private:
-  Ptr<Handler> m_handler;
+  // Ptr<Handler> m_handler;
 };
 
 } // namespace ndn