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

Refs #1005 (http://redmine.named-data.net/)
diff --git a/wscript b/wscript
index da9044c..6fac829 100644
--- a/wscript
+++ b/wscript
@@ -108,14 +108,14 @@
                                        'apps/*.cc',
                                        'utils/**/*.cc',
                                        'helper/**/*.cc',
-                                       'ndn.cxx/**/*.cc',
+                                       # 'ndn.cxx/**/*.cc',
                                        ])
     module.full_headers = [p.path_from(bld.path) for p in bld.path.ant_glob([
                            'utils/**/*.h',
                            'model/**/*.h',
                            'apps/**/*.h',
                            'helper/**/*.h',
-                           'ndn.cxx/**/*.h',
+                           # 'ndn.cxx/**/*.h',
                            ])]
 
     headers.source = [