diff --git a/Gruntfile.js b/Gruntfile.js
index 083c2563..3a84f03a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -103,10 +103,10 @@ module.exports = function(grunt) {
     compile: {
         curve25519_compiled: {
             src_files: [
-              'nacl/ed25519/additions/*.c',
-              'nacl/curve25519-donna.c',
-              'nacl/ed25519/*.c',
-              'nacl/ed25519/sha512/sha2big.c'
+              'native/ed25519/additions/*.c',
+              'native/curve25519-donna.c',
+              'native/ed25519/*.c',
+              'native/ed25519/sha512/sha2big.c'
             ],
             methods: [
               'curve25519_donna',
@@ -168,7 +168,7 @@ module.exports = function(grunt) {
           '-O2',
           '-Qunused-arguments',
           '-o',  outfile,
-          '-Inacl/ed25519/nacl_includes -Inacl/ed25519 -Inacl/ed25519/sha512',
+          '-Inative/ed25519/nacl_includes -Inative/ed25519 -Inative/ed25519/sha512',
           '-s', "EXPORTED_FUNCTIONS=\"[" + exported_functions.join(',') + "]\""];
       var command = [].concat('emcc', this.data.src_files, flags).join(' ');
       grunt.log.writeln('Compiling via emscripten to ' + outfile);
diff --git a/nacl/curve25519-donna.c b/native/curve25519-donna.c
similarity index 100%
rename from nacl/curve25519-donna.c
rename to native/curve25519-donna.c
diff --git a/nacl/ed25519/additions/compare.c b/native/ed25519/additions/compare.c
similarity index 100%
rename from nacl/ed25519/additions/compare.c
rename to native/ed25519/additions/compare.c
diff --git a/nacl/ed25519/additions/compare.h b/native/ed25519/additions/compare.h
similarity index 100%
rename from nacl/ed25519/additions/compare.h
rename to native/ed25519/additions/compare.h
diff --git a/nacl/ed25519/additions/curve_sigs.c b/native/ed25519/additions/curve_sigs.c
similarity index 100%
rename from nacl/ed25519/additions/curve_sigs.c
rename to native/ed25519/additions/curve_sigs.c
diff --git a/nacl/ed25519/additions/curve_sigs.h b/native/ed25519/additions/curve_sigs.h
similarity index 100%
rename from nacl/ed25519/additions/curve_sigs.h
rename to native/ed25519/additions/curve_sigs.h
diff --git a/nacl/ed25519/additions/sha512.c b/native/ed25519/additions/sha512.c
similarity index 100%
rename from nacl/ed25519/additions/sha512.c
rename to native/ed25519/additions/sha512.c
diff --git a/nacl/ed25519/additions/sha512.h b/native/ed25519/additions/sha512.h
similarity index 100%
rename from nacl/ed25519/additions/sha512.h
rename to native/ed25519/additions/sha512.h
diff --git a/nacl/ed25519/additions/sign_modified.c b/native/ed25519/additions/sign_modified.c
similarity index 100%
rename from nacl/ed25519/additions/sign_modified.c
rename to native/ed25519/additions/sign_modified.c
diff --git a/nacl/ed25519/api.h b/native/ed25519/api.h
similarity index 100%
rename from nacl/ed25519/api.h
rename to native/ed25519/api.h
diff --git a/nacl/ed25519/base.h b/native/ed25519/base.h
similarity index 100%
rename from nacl/ed25519/base.h
rename to native/ed25519/base.h
diff --git a/nacl/ed25519/base2.h b/native/ed25519/base2.h
similarity index 100%
rename from nacl/ed25519/base2.h
rename to native/ed25519/base2.h
diff --git a/nacl/ed25519/d.h b/native/ed25519/d.h
similarity index 100%
rename from nacl/ed25519/d.h
rename to native/ed25519/d.h
diff --git a/nacl/ed25519/d2.h b/native/ed25519/d2.h
similarity index 100%
rename from nacl/ed25519/d2.h
rename to native/ed25519/d2.h
diff --git a/nacl/ed25519/fe.h b/native/ed25519/fe.h
similarity index 100%
rename from nacl/ed25519/fe.h
rename to native/ed25519/fe.h
diff --git a/nacl/ed25519/fe_0.c b/native/ed25519/fe_0.c
similarity index 100%
rename from nacl/ed25519/fe_0.c
rename to native/ed25519/fe_0.c
diff --git a/nacl/ed25519/fe_1.c b/native/ed25519/fe_1.c
similarity index 100%
rename from nacl/ed25519/fe_1.c
rename to native/ed25519/fe_1.c
diff --git a/nacl/ed25519/fe_add.c b/native/ed25519/fe_add.c
similarity index 100%
rename from nacl/ed25519/fe_add.c
rename to native/ed25519/fe_add.c
diff --git a/nacl/ed25519/fe_cmov.c b/native/ed25519/fe_cmov.c
similarity index 100%
rename from nacl/ed25519/fe_cmov.c
rename to native/ed25519/fe_cmov.c
diff --git a/nacl/ed25519/fe_copy.c b/native/ed25519/fe_copy.c
similarity index 100%
rename from nacl/ed25519/fe_copy.c
rename to native/ed25519/fe_copy.c
diff --git a/nacl/ed25519/fe_frombytes.c b/native/ed25519/fe_frombytes.c
similarity index 100%
rename from nacl/ed25519/fe_frombytes.c
rename to native/ed25519/fe_frombytes.c
diff --git a/nacl/ed25519/fe_invert.c b/native/ed25519/fe_invert.c
similarity index 100%
rename from nacl/ed25519/fe_invert.c
rename to native/ed25519/fe_invert.c
diff --git a/nacl/ed25519/fe_isnegative.c b/native/ed25519/fe_isnegative.c
similarity index 100%
rename from nacl/ed25519/fe_isnegative.c
rename to native/ed25519/fe_isnegative.c
diff --git a/nacl/ed25519/fe_isnonzero.c b/native/ed25519/fe_isnonzero.c
similarity index 100%
rename from nacl/ed25519/fe_isnonzero.c
rename to native/ed25519/fe_isnonzero.c
diff --git a/nacl/ed25519/fe_mul.c b/native/ed25519/fe_mul.c
similarity index 100%
rename from nacl/ed25519/fe_mul.c
rename to native/ed25519/fe_mul.c
diff --git a/nacl/ed25519/fe_neg.c b/native/ed25519/fe_neg.c
similarity index 100%
rename from nacl/ed25519/fe_neg.c
rename to native/ed25519/fe_neg.c
diff --git a/nacl/ed25519/fe_pow22523.c b/native/ed25519/fe_pow22523.c
similarity index 100%
rename from nacl/ed25519/fe_pow22523.c
rename to native/ed25519/fe_pow22523.c
diff --git a/nacl/ed25519/fe_sq.c b/native/ed25519/fe_sq.c
similarity index 100%
rename from nacl/ed25519/fe_sq.c
rename to native/ed25519/fe_sq.c
diff --git a/nacl/ed25519/fe_sq2.c b/native/ed25519/fe_sq2.c
similarity index 100%
rename from nacl/ed25519/fe_sq2.c
rename to native/ed25519/fe_sq2.c
diff --git a/nacl/ed25519/fe_sub.c b/native/ed25519/fe_sub.c
similarity index 100%
rename from nacl/ed25519/fe_sub.c
rename to native/ed25519/fe_sub.c
diff --git a/nacl/ed25519/fe_tobytes.c b/native/ed25519/fe_tobytes.c
similarity index 100%
rename from nacl/ed25519/fe_tobytes.c
rename to native/ed25519/fe_tobytes.c
diff --git a/nacl/ed25519/ge.h b/native/ed25519/ge.h
similarity index 100%
rename from nacl/ed25519/ge.h
rename to native/ed25519/ge.h
diff --git a/nacl/ed25519/ge_add.c b/native/ed25519/ge_add.c
similarity index 100%
rename from nacl/ed25519/ge_add.c
rename to native/ed25519/ge_add.c
diff --git a/nacl/ed25519/ge_add.h b/native/ed25519/ge_add.h
similarity index 100%
rename from nacl/ed25519/ge_add.h
rename to native/ed25519/ge_add.h
diff --git a/nacl/ed25519/ge_double_scalarmult.c b/native/ed25519/ge_double_scalarmult.c
similarity index 100%
rename from nacl/ed25519/ge_double_scalarmult.c
rename to native/ed25519/ge_double_scalarmult.c
diff --git a/nacl/ed25519/ge_frombytes.c b/native/ed25519/ge_frombytes.c
similarity index 100%
rename from nacl/ed25519/ge_frombytes.c
rename to native/ed25519/ge_frombytes.c
diff --git a/nacl/ed25519/ge_madd.c b/native/ed25519/ge_madd.c
similarity index 100%
rename from nacl/ed25519/ge_madd.c
rename to native/ed25519/ge_madd.c
diff --git a/nacl/ed25519/ge_madd.h b/native/ed25519/ge_madd.h
similarity index 100%
rename from nacl/ed25519/ge_madd.h
rename to native/ed25519/ge_madd.h
diff --git a/nacl/ed25519/ge_msub.c b/native/ed25519/ge_msub.c
similarity index 100%
rename from nacl/ed25519/ge_msub.c
rename to native/ed25519/ge_msub.c
diff --git a/nacl/ed25519/ge_msub.h b/native/ed25519/ge_msub.h
similarity index 100%
rename from nacl/ed25519/ge_msub.h
rename to native/ed25519/ge_msub.h
diff --git a/nacl/ed25519/ge_p1p1_to_p2.c b/native/ed25519/ge_p1p1_to_p2.c
similarity index 100%
rename from nacl/ed25519/ge_p1p1_to_p2.c
rename to native/ed25519/ge_p1p1_to_p2.c
diff --git a/nacl/ed25519/ge_p1p1_to_p3.c b/native/ed25519/ge_p1p1_to_p3.c
similarity index 100%
rename from nacl/ed25519/ge_p1p1_to_p3.c
rename to native/ed25519/ge_p1p1_to_p3.c
diff --git a/nacl/ed25519/ge_p2_0.c b/native/ed25519/ge_p2_0.c
similarity index 100%
rename from nacl/ed25519/ge_p2_0.c
rename to native/ed25519/ge_p2_0.c
diff --git a/nacl/ed25519/ge_p2_dbl.c b/native/ed25519/ge_p2_dbl.c
similarity index 100%
rename from nacl/ed25519/ge_p2_dbl.c
rename to native/ed25519/ge_p2_dbl.c
diff --git a/nacl/ed25519/ge_p2_dbl.h b/native/ed25519/ge_p2_dbl.h
similarity index 100%
rename from nacl/ed25519/ge_p2_dbl.h
rename to native/ed25519/ge_p2_dbl.h
diff --git a/nacl/ed25519/ge_p3_0.c b/native/ed25519/ge_p3_0.c
similarity index 100%
rename from nacl/ed25519/ge_p3_0.c
rename to native/ed25519/ge_p3_0.c
diff --git a/nacl/ed25519/ge_p3_dbl.c b/native/ed25519/ge_p3_dbl.c
similarity index 100%
rename from nacl/ed25519/ge_p3_dbl.c
rename to native/ed25519/ge_p3_dbl.c
diff --git a/nacl/ed25519/ge_p3_to_cached.c b/native/ed25519/ge_p3_to_cached.c
similarity index 100%
rename from nacl/ed25519/ge_p3_to_cached.c
rename to native/ed25519/ge_p3_to_cached.c
diff --git a/nacl/ed25519/ge_p3_to_p2.c b/native/ed25519/ge_p3_to_p2.c
similarity index 100%
rename from nacl/ed25519/ge_p3_to_p2.c
rename to native/ed25519/ge_p3_to_p2.c
diff --git a/nacl/ed25519/ge_p3_tobytes.c b/native/ed25519/ge_p3_tobytes.c
similarity index 100%
rename from nacl/ed25519/ge_p3_tobytes.c
rename to native/ed25519/ge_p3_tobytes.c
diff --git a/nacl/ed25519/ge_precomp_0.c b/native/ed25519/ge_precomp_0.c
similarity index 100%
rename from nacl/ed25519/ge_precomp_0.c
rename to native/ed25519/ge_precomp_0.c
diff --git a/nacl/ed25519/ge_scalarmult_base.c b/native/ed25519/ge_scalarmult_base.c
similarity index 100%
rename from nacl/ed25519/ge_scalarmult_base.c
rename to native/ed25519/ge_scalarmult_base.c
diff --git a/nacl/ed25519/ge_sub.c b/native/ed25519/ge_sub.c
similarity index 100%
rename from nacl/ed25519/ge_sub.c
rename to native/ed25519/ge_sub.c
diff --git a/nacl/ed25519/ge_sub.h b/native/ed25519/ge_sub.h
similarity index 100%
rename from nacl/ed25519/ge_sub.h
rename to native/ed25519/ge_sub.h
diff --git a/nacl/ed25519/ge_tobytes.c b/native/ed25519/ge_tobytes.c
similarity index 100%
rename from nacl/ed25519/ge_tobytes.c
rename to native/ed25519/ge_tobytes.c
diff --git a/nacl/ed25519/main/main.c b/native/ed25519/main/main.c
similarity index 100%
rename from nacl/ed25519/main/main.c
rename to native/ed25519/main/main.c
diff --git a/nacl/ed25519/nacl_includes/crypto_hash_sha512.h b/native/ed25519/nacl_includes/crypto_hash_sha512.h
similarity index 100%
rename from nacl/ed25519/nacl_includes/crypto_hash_sha512.h
rename to native/ed25519/nacl_includes/crypto_hash_sha512.h
diff --git a/nacl/ed25519/nacl_includes/crypto_int32.h b/native/ed25519/nacl_includes/crypto_int32.h
similarity index 100%
rename from nacl/ed25519/nacl_includes/crypto_int32.h
rename to native/ed25519/nacl_includes/crypto_int32.h
diff --git a/nacl/ed25519/nacl_includes/crypto_int64.h b/native/ed25519/nacl_includes/crypto_int64.h
similarity index 100%
rename from nacl/ed25519/nacl_includes/crypto_int64.h
rename to native/ed25519/nacl_includes/crypto_int64.h
diff --git a/nacl/ed25519/nacl_includes/crypto_sign.h b/native/ed25519/nacl_includes/crypto_sign.h
similarity index 100%
rename from nacl/ed25519/nacl_includes/crypto_sign.h
rename to native/ed25519/nacl_includes/crypto_sign.h
diff --git a/nacl/ed25519/nacl_includes/crypto_sign_edwards25519sha512batch.h b/native/ed25519/nacl_includes/crypto_sign_edwards25519sha512batch.h
similarity index 100%
rename from nacl/ed25519/nacl_includes/crypto_sign_edwards25519sha512batch.h
rename to native/ed25519/nacl_includes/crypto_sign_edwards25519sha512batch.h
diff --git a/nacl/ed25519/nacl_includes/crypto_uint32.h b/native/ed25519/nacl_includes/crypto_uint32.h
similarity index 100%
rename from nacl/ed25519/nacl_includes/crypto_uint32.h
rename to native/ed25519/nacl_includes/crypto_uint32.h
diff --git a/nacl/ed25519/nacl_includes/crypto_uint64.h b/native/ed25519/nacl_includes/crypto_uint64.h
similarity index 100%
rename from nacl/ed25519/nacl_includes/crypto_uint64.h
rename to native/ed25519/nacl_includes/crypto_uint64.h
diff --git a/nacl/ed25519/nacl_includes/crypto_verify_32.h b/native/ed25519/nacl_includes/crypto_verify_32.h
similarity index 100%
rename from nacl/ed25519/nacl_includes/crypto_verify_32.h
rename to native/ed25519/nacl_includes/crypto_verify_32.h
diff --git a/nacl/ed25519/open.c b/native/ed25519/open.c
similarity index 100%
rename from nacl/ed25519/open.c
rename to native/ed25519/open.c
diff --git a/nacl/ed25519/pow22523.h b/native/ed25519/pow22523.h
similarity index 100%
rename from nacl/ed25519/pow22523.h
rename to native/ed25519/pow22523.h
diff --git a/nacl/ed25519/pow225521.h b/native/ed25519/pow225521.h
similarity index 100%
rename from nacl/ed25519/pow225521.h
rename to native/ed25519/pow225521.h
diff --git a/nacl/ed25519/sc.h b/native/ed25519/sc.h
similarity index 100%
rename from nacl/ed25519/sc.h
rename to native/ed25519/sc.h
diff --git a/nacl/ed25519/sc_muladd.c b/native/ed25519/sc_muladd.c
similarity index 100%
rename from nacl/ed25519/sc_muladd.c
rename to native/ed25519/sc_muladd.c
diff --git a/nacl/ed25519/sc_reduce.c b/native/ed25519/sc_reduce.c
similarity index 100%
rename from nacl/ed25519/sc_reduce.c
rename to native/ed25519/sc_reduce.c
diff --git a/nacl/ed25519/sha512/LICENSE.txt b/native/ed25519/sha512/LICENSE.txt
similarity index 100%
rename from nacl/ed25519/sha512/LICENSE.txt
rename to native/ed25519/sha512/LICENSE.txt
diff --git a/nacl/ed25519/sha512/md_helper.c b/native/ed25519/sha512/md_helper.c
similarity index 100%
rename from nacl/ed25519/sha512/md_helper.c
rename to native/ed25519/sha512/md_helper.c
diff --git a/nacl/ed25519/sha512/sha2big.c b/native/ed25519/sha512/sha2big.c
similarity index 100%
rename from nacl/ed25519/sha512/sha2big.c
rename to native/ed25519/sha512/sha2big.c
diff --git a/nacl/ed25519/sha512/sph_sha2.h b/native/ed25519/sha512/sph_sha2.h
similarity index 100%
rename from nacl/ed25519/sha512/sph_sha2.h
rename to native/ed25519/sha512/sph_sha2.h
diff --git a/nacl/ed25519/sha512/sph_types.h b/native/ed25519/sha512/sph_types.h
similarity index 100%
rename from nacl/ed25519/sha512/sph_types.h
rename to native/ed25519/sha512/sph_types.h
diff --git a/nacl/ed25519/sign.c b/native/ed25519/sign.c
similarity index 100%
rename from nacl/ed25519/sign.c
rename to native/ed25519/sign.c
diff --git a/nacl/ed25519/sqrtm1.h b/native/ed25519/sqrtm1.h
similarity index 100%
rename from nacl/ed25519/sqrtm1.h
rename to native/ed25519/sqrtm1.h