diff --git a/packages/ssf-cli/package.json b/packages/ssf-cli/package.json
index b5b9a09..c8e9e85 100644
--- a/packages/ssf-cli/package.json
+++ b/packages/ssf-cli/package.json
@@ -1,27 +1,28 @@
 {
 	"name": "ssf-cli",
 	"version": "1.1.0",
-	"author": "Garrett Luu",
+	"author": "sheetjs",
 	"description": "Command-line interface for ssf",
 	"keywords": [
 		"format",
 		"sprintf",
 		"spreadsheet"
 	],
-	"main": "./index.js",
+	"main": "index.js",
 	"bin": {
-		"ssf-cli": "./bin/ssf.njs"
+		"ssf-cli": "bin/ssf.njs"
 	},
 	"dependencies": {
 		"ssf": "^0.11.2"
 	},
 	"repository": {
 		"type": "git",
-		"url": "git://github.com/SheetJS/ssf.git"
+		"url": "git://github.com/SheetJS/sheetjs.git",
+		"directory": "packages/ssf-cli"
 	},
 	"homepage": "http://sheetjs.com/",
 	"bugs": {
-		"url": "https://github.com/SheetJS/ssf/issues"
+		"url": "https://github.com/SheetJS/sheetjs/issues"
 	},
 	"license": "Apache-2.0",
 	"engines": {
diff --git a/.eslintrc b/packages/ssf/.eslintrc
similarity index 100%
rename from .eslintrc
rename to packages/ssf/.eslintrc
diff --git a/.flowconfig b/packages/ssf/.flowconfig
similarity index 100%
rename from .flowconfig
rename to packages/ssf/.flowconfig
diff --git a/.gitignore b/packages/ssf/.gitignore
similarity index 100%
rename from .gitignore
rename to packages/ssf/.gitignore
diff --git a/.jscs.json b/packages/ssf/.jscs.json
similarity index 100%
rename from .jscs.json
rename to packages/ssf/.jscs.json
diff --git a/.npmignore b/packages/ssf/.npmignore
similarity index 100%
rename from .npmignore
rename to packages/ssf/.npmignore
diff --git a/.spelling b/packages/ssf/.spelling
similarity index 100%
rename from .spelling
rename to packages/ssf/.spelling
diff --git a/.travis.yml b/packages/ssf/.travis.yml
similarity index 100%
rename from .travis.yml
rename to packages/ssf/.travis.yml
diff --git a/LICENSE b/packages/ssf/LICENSE
similarity index 100%
rename from LICENSE
rename to packages/ssf/LICENSE
diff --git a/Makefile b/packages/ssf/Makefile
similarity index 100%
rename from Makefile
rename to packages/ssf/Makefile
diff --git a/README.md b/packages/ssf/README.md
similarity index 100%
rename from README.md
rename to packages/ssf/README.md
diff --git a/bits/00_header.js b/packages/ssf/bits/00_header.js
similarity index 100%
rename from bits/00_header.js
rename to packages/ssf/bits/00_header.js
diff --git a/bits/01_version.js b/packages/ssf/bits/01_version.js
similarity index 100%
rename from bits/01_version.js
rename to packages/ssf/bits/01_version.js
diff --git a/bits/02_utilities.js b/packages/ssf/bits/02_utilities.js
similarity index 100%
rename from bits/02_utilities.js
rename to packages/ssf/bits/02_utilities.js
diff --git a/bits/10_types.js b/packages/ssf/bits/10_types.js
similarity index 100%
rename from bits/10_types.js
rename to packages/ssf/bits/10_types.js
diff --git a/bits/20_consts.js b/packages/ssf/bits/20_consts.js
similarity index 100%
rename from bits/20_consts.js
rename to packages/ssf/bits/20_consts.js
diff --git a/bits/25_table.js b/packages/ssf/bits/25_table.js
similarity index 100%
rename from bits/25_table.js
rename to packages/ssf/bits/25_table.js
diff --git a/bits/26_defaults.js b/packages/ssf/bits/26_defaults.js
similarity index 100%
rename from bits/26_defaults.js
rename to packages/ssf/bits/26_defaults.js
diff --git a/bits/30_frac.js b/packages/ssf/bits/30_frac.js
similarity index 100%
rename from bits/30_frac.js
rename to packages/ssf/bits/30_frac.js
diff --git a/bits/35_datecode.js b/packages/ssf/bits/35_datecode.js
similarity index 100%
rename from bits/35_datecode.js
rename to packages/ssf/bits/35_datecode.js
diff --git a/bits/40_general.js b/packages/ssf/bits/40_general.js
similarity index 100%
rename from bits/40_general.js
rename to packages/ssf/bits/40_general.js
diff --git a/bits/45_hijri.js b/packages/ssf/bits/45_hijri.js
similarity index 100%
rename from bits/45_hijri.js
rename to packages/ssf/bits/45_hijri.js
diff --git a/bits/49_thaidigits.js b/packages/ssf/bits/49_thaidigits.js
similarity index 100%
rename from bits/49_thaidigits.js
rename to packages/ssf/bits/49_thaidigits.js
diff --git a/bits/50_date.js b/packages/ssf/bits/50_date.js
similarity index 100%
rename from bits/50_date.js
rename to packages/ssf/bits/50_date.js
diff --git a/bits/56_commaify.js b/packages/ssf/bits/56_commaify.js
similarity index 100%
rename from bits/56_commaify.js
rename to packages/ssf/bits/56_commaify.js
diff --git a/bits/57_numhead.js b/packages/ssf/bits/57_numhead.js
similarity index 100%
rename from bits/57_numhead.js
rename to packages/ssf/bits/57_numhead.js
diff --git a/bits/59_numhelp.js b/packages/ssf/bits/59_numhelp.js
similarity index 100%
rename from bits/59_numhelp.js
rename to packages/ssf/bits/59_numhelp.js
diff --git a/bits/60_number.js b/packages/ssf/bits/60_number.js
similarity index 100%
rename from bits/60_number.js
rename to packages/ssf/bits/60_number.js
diff --git a/bits/63_numflt.js b/packages/ssf/bits/63_numflt.js
similarity index 100%
rename from bits/63_numflt.js
rename to packages/ssf/bits/63_numflt.js
diff --git a/bits/65_numinth.js b/packages/ssf/bits/65_numinth.js
similarity index 100%
rename from bits/65_numinth.js
rename to packages/ssf/bits/65_numinth.js
diff --git a/bits/66_numint.js b/packages/ssf/bits/66_numint.js
similarity index 100%
rename from bits/66_numint.js
rename to packages/ssf/bits/66_numint.js
diff --git a/bits/69_numfoot.js b/packages/ssf/bits/69_numfoot.js
similarity index 100%
rename from bits/69_numfoot.js
rename to packages/ssf/bits/69_numfoot.js
diff --git a/bits/80_split.js b/packages/ssf/bits/80_split.js
similarity index 100%
rename from bits/80_split.js
rename to packages/ssf/bits/80_split.js
diff --git a/bits/81_fmttype.js b/packages/ssf/bits/81_fmttype.js
similarity index 100%
rename from bits/81_fmttype.js
rename to packages/ssf/bits/81_fmttype.js
diff --git a/bits/82_eval.js b/packages/ssf/bits/82_eval.js
similarity index 100%
rename from bits/82_eval.js
rename to packages/ssf/bits/82_eval.js
diff --git a/bits/88_cond.js b/packages/ssf/bits/88_cond.js
similarity index 100%
rename from bits/88_cond.js
rename to packages/ssf/bits/88_cond.js
diff --git a/bits/90_main.js b/packages/ssf/bits/90_main.js
similarity index 100%
rename from bits/90_main.js
rename to packages/ssf/bits/90_main.js
diff --git a/bits/95_load.js b/packages/ssf/bits/95_load.js
similarity index 100%
rename from bits/95_load.js
rename to packages/ssf/bits/95_load.js
diff --git a/bits/98_exports.js b/packages/ssf/bits/98_exports.js
similarity index 100%
rename from bits/98_exports.js
rename to packages/ssf/bits/98_exports.js
diff --git a/bits/99_footer.js b/packages/ssf/bits/99_footer.js
similarity index 100%
rename from bits/99_footer.js
rename to packages/ssf/bits/99_footer.js
diff --git a/ctest/index.html b/packages/ssf/ctest/index.html
similarity index 100%
rename from ctest/index.html
rename to packages/ssf/ctest/index.html
diff --git a/ctest/json2.js b/packages/ssf/ctest/json2.js
similarity index 100%
rename from ctest/json2.js
rename to packages/ssf/ctest/json2.js
diff --git a/ctest/mocha.css b/packages/ssf/ctest/mocha.css
similarity index 100%
rename from ctest/mocha.css
rename to packages/ssf/ctest/mocha.css
diff --git a/ctest/mocha.js b/packages/ssf/ctest/mocha.js
similarity index 100%
rename from ctest/mocha.js
rename to packages/ssf/ctest/mocha.js
diff --git a/ctest/shim.js b/packages/ssf/ctest/shim.js
similarity index 100%
rename from ctest/shim.js
rename to packages/ssf/ctest/shim.js
diff --git a/index.html b/packages/ssf/index.html
similarity index 100%
rename from index.html
rename to packages/ssf/index.html
diff --git a/misc/flow.js b/packages/ssf/misc/flow.js
similarity index 100%
rename from misc/flow.js
rename to packages/ssf/misc/flow.js
diff --git a/misc/flowdeps.js b/packages/ssf/misc/flowdeps.js
similarity index 100%
rename from misc/flowdeps.js
rename to packages/ssf/misc/flowdeps.js
diff --git a/misc/help.sh b/packages/ssf/misc/help.sh
similarity index 100%
rename from misc/help.sh
rename to packages/ssf/misc/help.sh
diff --git a/misc/node_version.sh b/packages/ssf/misc/node_version.sh
similarity index 100%
rename from misc/node_version.sh
rename to packages/ssf/misc/node_version.sh
diff --git a/misc/perf.js b/packages/ssf/misc/perf.js
similarity index 100%
rename from misc/perf.js
rename to packages/ssf/misc/perf.js
diff --git a/misc/perf.sh b/packages/ssf/misc/perf.sh
similarity index 100%
rename from misc/perf.sh
rename to packages/ssf/misc/perf.sh
diff --git a/misc/photoshop.jsx b/packages/ssf/misc/photoshop.jsx
similarity index 100%
rename from misc/photoshop.jsx
rename to packages/ssf/misc/photoshop.jsx
diff --git a/misc/spin.sh b/packages/ssf/misc/spin.sh
similarity index 100%
rename from misc/spin.sh
rename to packages/ssf/misc/spin.sh
diff --git a/package.json b/packages/ssf/package.json
similarity index 85%
rename from package.json
rename to packages/ssf/package.json
index 4fcf039..be6f8c9 100644
--- a/package.json
+++ b/packages/ssf/package.json
@@ -8,7 +8,7 @@
 		"sprintf",
 		"spreadsheet"
 	],
-	"main": "./ssf",
+	"main": "ssf.js",
 	"types": "types",
 	"dependencies": {
 		"frac":"~1.1.2"
@@ -23,7 +23,8 @@
 	},
 	"repository": {
 		"type": "git",
-		"url": "git://github.com/SheetJS/ssf.git"
+		"url": "git://github.com/SheetJS/sheetjs.git",
+		"directory": "packages/ssf"
 	},
 	"scripts": {
 		"test": "make test",
@@ -48,7 +49,7 @@
 	},
 	"homepage": "http://sheetjs.com/",
 	"bugs": {
-		"url": "https://github.com/SheetJS/ssf/issues"
+		"url": "https://github.com/SheetJS/sheetjs/issues"
 	},
 	"license": "Apache-2.0",
 	"engines": {
diff --git a/ssf.flow.js b/packages/ssf/ssf.flow.js
similarity index 100%
rename from ssf.flow.js
rename to packages/ssf/ssf.flow.js
diff --git a/ssf.js b/packages/ssf/ssf.js
similarity index 100%
rename from ssf.js
rename to packages/ssf/ssf.js
diff --git a/ssf.md b/packages/ssf/ssf.md
similarity index 100%
rename from ssf.md
rename to packages/ssf/ssf.md
diff --git a/test/cal.tsv b/packages/ssf/test/cal.tsv
similarity index 100%
rename from test/cal.tsv
rename to packages/ssf/test/cal.tsv
diff --git a/test/comma.js b/packages/ssf/test/comma.js
similarity index 100%
rename from test/comma.js
rename to packages/ssf/test/comma.js
diff --git a/test/comma.tsv b/packages/ssf/test/comma.tsv
similarity index 100%
rename from test/comma.tsv
rename to packages/ssf/test/comma.tsv
diff --git a/test/date.js b/packages/ssf/test/date.js
similarity index 100%
rename from test/date.js
rename to packages/ssf/test/date.js
diff --git a/test/date.json b/packages/ssf/test/date.json
similarity index 100%
rename from test/date.json
rename to packages/ssf/test/date.json
diff --git a/test/dateNF.js b/packages/ssf/test/dateNF.js
similarity index 100%
rename from test/dateNF.js
rename to packages/ssf/test/dateNF.js
diff --git a/test/dates.js b/packages/ssf/test/dates.js
similarity index 100%
rename from test/dates.js
rename to packages/ssf/test/dates.js
diff --git a/test/dates.tsv b/packages/ssf/test/dates.tsv
similarity index 100%
rename from test/dates.tsv
rename to packages/ssf/test/dates.tsv
diff --git a/test/exp.js b/packages/ssf/test/exp.js
similarity index 100%
rename from test/exp.js
rename to packages/ssf/test/exp.js
diff --git a/test/exp.tsv b/packages/ssf/test/exp.tsv
similarity index 100%
rename from test/exp.tsv
rename to packages/ssf/test/exp.tsv
diff --git a/test/fraction.js b/packages/ssf/test/fraction.js
similarity index 100%
rename from test/fraction.js
rename to packages/ssf/test/fraction.js
diff --git a/test/fraction.json b/packages/ssf/test/fraction.json
similarity index 100%
rename from test/fraction.json
rename to packages/ssf/test/fraction.json
diff --git a/test/general.js b/packages/ssf/test/general.js
similarity index 100%
rename from test/general.js
rename to packages/ssf/test/general.js
diff --git a/test/general.json b/packages/ssf/test/general.json
similarity index 100%
rename from test/general.json
rename to packages/ssf/test/general.json
diff --git a/test/implied.js b/packages/ssf/test/implied.js
similarity index 100%
rename from test/implied.js
rename to packages/ssf/test/implied.js
diff --git a/test/implied.json b/packages/ssf/test/implied.json
similarity index 100%
rename from test/implied.json
rename to packages/ssf/test/implied.json
diff --git a/test/implied.njs b/packages/ssf/test/implied.njs
similarity index 100%
rename from test/implied.njs
rename to packages/ssf/test/implied.njs
diff --git a/test/is_date.json b/packages/ssf/test/is_date.json
similarity index 100%
rename from test/is_date.json
rename to packages/ssf/test/is_date.json
diff --git a/test/negative.js b/packages/ssf/test/negative.js
similarity index 100%
rename from test/negative.js
rename to packages/ssf/test/negative.js
diff --git a/test/oddities.js b/packages/ssf/test/oddities.js
similarity index 100%
rename from test/oddities.js
rename to packages/ssf/test/oddities.js
diff --git a/test/oddities.json b/packages/ssf/test/oddities.json
similarity index 100%
rename from test/oddities.json
rename to packages/ssf/test/oddities.json
diff --git a/test/times.tsv b/packages/ssf/test/times.tsv
similarity index 100%
rename from test/times.tsv
rename to packages/ssf/test/times.tsv
diff --git a/test/utilities.js b/packages/ssf/test/utilities.js
similarity index 100%
rename from test/utilities.js
rename to packages/ssf/test/utilities.js
diff --git a/test/valid.js b/packages/ssf/test/valid.js
similarity index 100%
rename from test/valid.js
rename to packages/ssf/test/valid.js
diff --git a/test/valid.tsv b/packages/ssf/test/valid.tsv
similarity index 100%
rename from test/valid.tsv
rename to packages/ssf/test/valid.tsv
diff --git a/types/.npmignore b/packages/ssf/types/.npmignore
similarity index 100%
rename from types/.npmignore
rename to packages/ssf/types/.npmignore
diff --git a/types/bin_ssf.ts b/packages/ssf/types/bin_ssf.ts
similarity index 100%
rename from types/bin_ssf.ts
rename to packages/ssf/types/bin_ssf.ts
diff --git a/types/index.d.ts b/packages/ssf/types/index.d.ts
similarity index 100%
rename from types/index.d.ts
rename to packages/ssf/types/index.d.ts
diff --git a/types/ssf-test.ts b/packages/ssf/types/ssf-test.ts
similarity index 100%
rename from types/ssf-test.ts
rename to packages/ssf/types/ssf-test.ts
diff --git a/types/tsconfig.json b/packages/ssf/types/tsconfig.json
similarity index 100%
rename from types/tsconfig.json
rename to packages/ssf/types/tsconfig.json
diff --git a/types/tslint.json b/packages/ssf/types/tslint.json
similarity index 100%
rename from types/tslint.json
rename to packages/ssf/types/tslint.json