diff --git a/.document b/.document
index 6a90307..f5cc940 100644
--- a/.document
+++ b/.document
@@ -1,6 +1,6 @@
 README.rdoc
 CHANGELOG.rdoc
 lib/**/*.rb
-bin/*
+exe/*
 features/**/*.feature
 LICENSE
diff --git a/.gitignore b/.gitignore
index 9b37b77..4c6569b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,5 +12,5 @@ pkg
 .sass-cache/**/*
 test_project/.sass-cache/**/*
 junk/*
-!bin/serve
-bin/*
+!exe/serve
+exe/*
diff --git a/bin/serve b/bin/serve
deleted file mode 100755
index 0b99130..0000000
--- a/bin/serve
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'serve' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('serve', 'serve')
diff --git a/serve.gemspec b/serve.gemspec
index 7601b3e..4850ba0 100644
--- a/serve.gemspec
+++ b/serve.gemspec
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
-    "bin/serve",
+    "exe/serve",
     "lib/serve.rb",
     "lib/serve/application.rb",
     "lib/serve/bootstrap/Gemfile",
@@ -162,4 +162,3 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<coffee-script>, ["~> 2.2.0"])
   end
 end
-
diff --git a/tasks/jeweler.rake b/tasks/jeweler.rake
index 092c294..7e42c8c 100644
--- a/tasks/jeweler.rake
+++ b/tasks/jeweler.rake
@@ -7,13 +7,13 @@ begin
     gem.email = "me@johnwlong.com"
     gem.homepage = "http://get-serve.com"
     gem.authors = ["John W. Long", "Adam I. Williams", "Robert Evans"]
-    
-    gem.files = FileList["[A-Z]*", "{bin,lib,rails,spec}/**/*"].exclude("tmp")
+
+    gem.files = FileList["[A-Z]*", "{exe,lib,rails,spec}/**/*"].exclude("tmp")
     gem.files << 'lib/serve/templates/blank/.empty'
     gem.files << 'lib/serve/templates/default/public/.htaccess'
 
     gem.license = 'MIT'
-    
+
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
diff --git a/tasks/website.rake b/tasks/website.rake
index 10a6690..3f9ac74 100644
--- a/tasks/website.rake
+++ b/tasks/website.rake
@@ -7,29 +7,29 @@ def ok_failed(condition)
 end
 
 namespace :website do
-  
+
   desc "remove files in output directory"
   task :clean do
     puts "Removing output..."
     Dir["website/output/*"].each { |f| rm_rf(f) }
   end
-  
+
   desc "generate website in output directory"
   task :generate => :clean do
     puts "Generating website..."
-    system "bin/serve export website website/output"
+    system "exe/serve export website website/output"
   end
-  
+
   desc "generate and deploy website"
   task :deploy => :generate do
     print "Deploying website..."
     ok_failed system("rsync -avz --delete --rsync-path=/usr/local/bin/rsync website/output/ wiseheart@wiseheartdesign.com:~/domains/get-serve.com/web/public")
   end
-  
+
   desc "serve website using serve (how meta)"
   task :serve do
     puts "Serving website..."
     system "serve website"
   end
-  
+
 end