diff --git a/.gitignore b/.gitignore
index 7e86271..d9860d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-exa
-exa-test
 *~
+target
diff --git a/.travis.yml b/.travis.yml
index 1ff0a44..23a7089 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,4 +4,4 @@ before_install:
 install:
   - sudo apt-get install rust-nightly
 script:
-  - make test
\ No newline at end of file
+  - cargo test
diff --git a/Cargo.toml b/Cargo.toml
new file mode 100644
index 0000000..b1a6463
--- /dev/null
+++ b/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+
+name = "exa"
+version = "0.1.0"
+authors = [ "ogham@bsago.me" ]
+
+[[bin]]
+
+name = "exa"
\ No newline at end of file
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 1383d9e..0000000
--- a/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-COMPILER = rustc
-
-all:
-	$(COMPILER) exa.rs
-
-test:
-	$(COMPILER) --test exa.rs -o exa-test
-	./exa-test
-
-clean:
-	rm -f exa
-	rm -f exa-test
-
-
-
diff --git a/README.md b/README.md
index 17b0228..0f2cae4 100644
--- a/README.md
+++ b/README.md
@@ -27,4 +27,4 @@ Options
 Installation
 ------------
 
-exa is written in [Rust](http://www.rust-lang.org). You should use the nightly, rather than the 0.10 release, which is rather out of date at this point. Once you have Rust set up, a simple `make` should compile exa.
+exa is written in [Rust](http://www.rust-lang.org). You should use the nightly, rather than the 0.10 release, which is rather out of date at this point. Once you have Rust set up, a simple `cargo build` will compile exa. Unless you don't have Cargo installed, in which case just `rustc src/exa.rs` will do.
\ No newline at end of file
diff --git a/colours.rs b/src/colours.rs
similarity index 100%
rename from colours.rs
rename to src/colours.rs
diff --git a/column.rs b/src/column.rs
similarity index 100%
rename from column.rs
rename to src/column.rs
diff --git a/dir.rs b/src/dir.rs
similarity index 100%
rename from dir.rs
rename to src/dir.rs
diff --git a/exa.rs b/src/exa.rs
similarity index 100%
rename from exa.rs
rename to src/exa.rs
diff --git a/file.rs b/src/file.rs
similarity index 100%
rename from file.rs
rename to src/file.rs
diff --git a/filetype.rs b/src/filetype.rs
similarity index 100%
rename from filetype.rs
rename to src/filetype.rs
diff --git a/format.rs b/src/format.rs
similarity index 100%
rename from format.rs
rename to src/format.rs
diff --git a/options.rs b/src/options.rs
similarity index 100%
rename from options.rs
rename to src/options.rs
diff --git a/sort.rs b/src/sort.rs
similarity index 100%
rename from sort.rs
rename to src/sort.rs
diff --git a/unix.rs b/src/unix.rs
similarity index 100%
rename from unix.rs
rename to src/unix.rs