diff --git a/Rakefile b/Rakefile
new file mode 100644
index 0000000000000000000000000000000000000000..1bbda7d3970e40d8b9c226ec827a3059c3013242
--- /dev/null
+++ b/Rakefile
@@ -0,0 +1,11 @@
+require 'rubygems'
+require 'rake'
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/tc_*.rb'
+  test.verbose = true
+end
+
+task :default => :test
diff --git a/jsduck.rb b/jsduck.rb
deleted file mode 100755
index a40e61ba5d739ebc69a1b64e68c253c1ef6acc11..0000000000000000000000000000000000000000
--- a/jsduck.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env ruby
-require 'parser'
-require 'pp'
-
-module JsDuck
-  def JsDuck.parse(input)
-    Parser.new(input).parse
-  end
-end
-
-
-if __FILE__ == $0 then
-  JsDuck.parse($stdin.read).each {|d| pp d; puts}
-end
-
diff --git a/lib/jsduck.rb b/lib/jsduck.rb
new file mode 100755
index 0000000000000000000000000000000000000000..812b5a7d579c027cca629014786263c0ece86168
--- /dev/null
+++ b/lib/jsduck.rb
@@ -0,0 +1,20 @@
+$:.unshift File.dirname(__FILE__) # For running the actual JsDuck app
+
+require 'jsduck/lexer'
+require 'jsduck/doc_comment'
+require 'jsduck/doc_comment_parser'
+require 'jsduck/parser'
+
+require 'pp'
+
+module JsDuck
+  def JsDuck.parse(input)
+    Parser.new(input).parse
+  end
+end
+
+
+if __FILE__ == $0 then
+  JsDuck.parse($stdin.read).each {|d| pp d; puts}
+end
+
diff --git a/doc_comment.rb b/lib/jsduck/doc_comment.rb
similarity index 100%
rename from doc_comment.rb
rename to lib/jsduck/doc_comment.rb
diff --git a/doc_comment_parser.rb b/lib/jsduck/doc_comment_parser.rb
similarity index 100%
rename from doc_comment_parser.rb
rename to lib/jsduck/doc_comment_parser.rb
diff --git a/lexer.rb b/lib/jsduck/lexer.rb
similarity index 100%
rename from lexer.rb
rename to lib/jsduck/lexer.rb
diff --git a/parser.rb b/lib/jsduck/parser.rb
similarity index 98%
rename from parser.rb
rename to lib/jsduck/parser.rb
index cd7290276cdc6d56d165ff4f0f20cae151ea9f73..1d87a02b7b1a3fc497b419e9861dd77adf885e78 100644
--- a/parser.rb
+++ b/lib/jsduck/parser.rb
@@ -1,6 +1,3 @@
-require 'lexer'
-require 'doc_comment_parser'
-require 'doc_comment'
 
 module JsDuck
 
diff --git a/tc_doc_comment_parser.rb b/test/tc_doc_comment_parser.rb
similarity index 99%
rename from tc_doc_comment_parser.rb
rename to test/tc_doc_comment_parser.rb
index bbe497d8ef404b7b44ea088d4c9c7c743e498097..c49bc1ac95d0e8049f4d1dea7695b52ffdde09b7 100644
--- a/tc_doc_comment_parser.rb
+++ b/test/tc_doc_comment_parser.rb
@@ -1,4 +1,4 @@
-require "doc_comment_parser"
+require "jsduck/doc_comment_parser"
 require "test/unit"
 
 class TestDocCommentParser < Test::Unit::TestCase
diff --git a/tc_jsduck.rb b/test/tc_jsduck.rb
similarity index 100%
rename from tc_jsduck.rb
rename to test/tc_jsduck.rb
diff --git a/tc_lexer.rb b/test/tc_lexer.rb
similarity index 98%
rename from tc_lexer.rb
rename to test/tc_lexer.rb
index 7bdd6a5459e6d3de8e2f10141a34ea0e4a4de274..6342f6ec878dfbb0d6ec33186d53ee7c402832f3 100644
--- a/tc_lexer.rb
+++ b/test/tc_lexer.rb
@@ -1,4 +1,4 @@
-require "lexer"
+require "jsduck/lexer"
 require "test/unit"
 
 class TestLexer < Test::Unit::TestCase