gnagel · gnagel · Jun 23, 2013 · Jun 22, 2013 · Jun 22, 2013 · Jun 22, 2013
diff --git a/binding.gyp b/binding.gyp
@@ -1,4 +1,5 @@
 {
+"variables": { "library_files": ["lib/cgeohash_obj.js", "lib/cgeohash_fn.js", "lib/cgeohash_obj_speed_tests.js", "lib/cgeohash_fn_speed_tests.js"] },
     "conditions": [
         [
             "OS=='win'", 
@@ -35,12 +36,15 @@
                     }
                 ]
             ], 
+            "include_dirs": ["src"],
             "sources": [
-                "bindings.cpp",
-                "geohash.cpp",
-                "geohash_node_binding.cpp",
-                "geohash_node_binding_speed.cpp",
-                "geohash_obj.cpp"
+                "src/cgeohash_bindings.cpp",
+                "src/cgeohash.cpp",
+                "src/cgeohash_fn.cpp",
+                "src/cgeohash_fn_repeaters.cpp",
+                "src/cgeohash_obj.cpp",
+                "src/cgeohash_obj_repeaters.cpp",
+                "src/cgeohash_nanoseconds.cpp"
             ], 
             "target_name": "cgeohash"
         }

diff --git a/bindings.cpp b/bindings.cpp
diff --git a/geohash.hpp b/geohash.hpp
diff --git a/geohash.js b/geohash.js
diff --git a/geohash_node_binding.hpp b/geohash_node_binding.hpp
diff --git a/geohash_node_binding_speed.cpp b/geohash_node_binding_speed.cpp
diff --git a/geohash_node_binding_speed.hpp b/geohash_node_binding_speed.hpp
diff --git a/geohash_obj.cpp b/geohash_obj.cpp
diff --git a/cvv8/ClassCreator.hpp → includes/cvv8/ClassCreator.hpp b/cvv8/ClassCreator.hpp → includes/cvv8/ClassCreator.hpp
diff --git a/cvv8/Makefile → includes/cvv8/Makefile b/cvv8/Makefile → includes/cvv8/Makefile
diff --git a/cvv8/NativeToJSMap.hpp → includes/cvv8/NativeToJSMap.hpp b/cvv8/NativeToJSMap.hpp → includes/cvv8/NativeToJSMap.hpp
diff --git a/cvv8/V8Shell.hpp → includes/cvv8/V8Shell.hpp b/cvv8/V8Shell.hpp → includes/cvv8/V8Shell.hpp
diff --git a/cvv8/XTo.hpp → includes/cvv8/XTo.hpp b/cvv8/XTo.hpp → includes/cvv8/XTo.hpp
diff --git a/cvv8/arguments.hpp → includes/cvv8/arguments.hpp b/cvv8/arguments.hpp → includes/cvv8/arguments.hpp
diff --git a/cvv8/convert.hpp → includes/cvv8/convert.hpp b/cvv8/convert.hpp → includes/cvv8/convert.hpp
diff --git a/cvv8/detail/Makefile → includes/cvv8/detail/Makefile b/cvv8/detail/Makefile → includes/cvv8/detail/Makefile
diff --git a/cvv8/detail/convert_core.hpp → includes/cvv8/detail/convert_core.hpp b/cvv8/detail/convert_core.hpp → includes/cvv8/detail/convert_core.hpp
diff --git a/cvv8/detail/doxygen_hack.hpp → includes/cvv8/detail/doxygen_hack.hpp b/cvv8/detail/doxygen_hack.hpp → includes/cvv8/detail/doxygen_hack.hpp
diff --git a/cvv8/detail/invocable_core.hpp → includes/cvv8/detail/invocable_core.hpp b/cvv8/detail/invocable_core.hpp → includes/cvv8/detail/invocable_core.hpp
diff --git a/cvv8/detail/invocable_generated.hpp → includes/cvv8/detail/invocable_generated.hpp b/cvv8/detail/invocable_generated.hpp → includes/cvv8/detail/invocable_generated.hpp
diff --git a/cvv8/detail/signature_core.hpp → includes/cvv8/detail/signature_core.hpp b/cvv8/detail/signature_core.hpp → includes/cvv8/detail/signature_core.hpp
diff --git a/cvv8/detail/signature_generated.hpp → includes/cvv8/detail/signature_generated.hpp b/cvv8/detail/signature_generated.hpp → includes/cvv8/detail/signature_generated.hpp
diff --git a/cvv8/detail/tmp.hpp → includes/cvv8/detail/tmp.hpp b/cvv8/detail/tmp.hpp → includes/cvv8/detail/tmp.hpp
diff --git a/cvv8/generator/Signature.hpp → includes/cvv8/generator/Signature.hpp b/cvv8/generator/Signature.hpp → includes/cvv8/generator/Signature.hpp
diff --git a/cvv8/invocable.hpp → includes/cvv8/invocable.hpp b/cvv8/invocable.hpp → includes/cvv8/invocable.hpp
diff --git a/cvv8/properties.hpp → includes/cvv8/properties.hpp b/cvv8/properties.hpp → includes/cvv8/properties.hpp
diff --git a/cvv8/signature.hpp → includes/cvv8/signature.hpp b/cvv8/signature.hpp → includes/cvv8/signature.hpp
diff --git a/cvv8/v8-convert.hpp → includes/cvv8/v8-convert.hpp b/cvv8/v8-convert.hpp → includes/cvv8/v8-convert.hpp
diff --git a/lib/cgeohash_fn.js b/lib/cgeohash_fn.js
@@ -0,0 +1,8 @@
+var cgeohash = require('../build/Release/cgeohash');
+
+module.exports = {
+    encode:        cgeohash.encode_fn,
+    decode:        cgeohash.decode_fn,
+    decode_bbox:   cgeohash.decode_bbox_fn,
+    neighbor:      cgeohash.neighbor_fn,
+};