diff --git a/Casks/woodhouse.rb b/Casks/woodhouse.rb
new file mode 100644
index 00000000000..9f82ed052c4
--- /dev/null
+++ b/Casks/woodhouse.rb
@@ -0,0 +1,5 @@
+class Woodhouse < Cask
+  url 'https://github.com/downloads/phinze/woodhouse/Woodhouse-0.4.0.dmg'
+  version '0.4.0'
+  homepage 'https://github.com/phinze/woodhouse/'
+end
diff --git a/brew-cask.rb b/brew-cask.rb
index 8744c097cc9..b105327ba56 100644
--- a/brew-cask.rb
+++ b/brew-cask.rb
@@ -1,37 +1,16 @@
 require 'formula'
 
 class BrewCask < Formula
-  homepage 'https://github.com/phinze/brew-cask/'
-  head 'https://github.com/phinze/brew-cask.git'
+  homepage 'https://github.com/phinze/homebrew-cask/'
+  head 'https://github.com/phinze/homebrew-cask.git'
 
   skip_clean :all
 
   def install
-
     prefix.install_p 'lib', 'rubylib'
     inreplace 'bin/brew-cask.rb', '/lib', '/rubylib'
 
     prefix.install 'Casks', 'bin'
     (bin+'brew-cask.rb').chmod 0755
-
-    unless cask_symlink_dst.symlink?
-      File.symlink(cask_symlink_src, cask_symlink_dst)
-    end
   end
-
-  def cask_symlink_src
-    prefix+'Casks'
-  end
-
-  def cask_symlink_dst
-    HOMEBREW_PREFIX.join('Library','Casks')
-  end
-
-  def caveats; <<-EOS.undent
-    This formula installs a symlink that it cannot remove:
-      #{cask_symlink_dst} -> #{cask_symlink_src}
-    
-    You'll need to remove it manually if you want to uninstall.
-    EOS
-  end
-end
\ No newline at end of file
+end
diff --git a/lib/cask.rb b/lib/cask.rb
index 34c0b8964cd..2c15f43673e 100644
--- a/lib/cask.rb
+++ b/lib/cask.rb
@@ -15,7 +15,7 @@ require 'plist/parser'
 
 class Cask
   def self.path
-    HOMEBREW_PREFIX.join("Library", "Casks")
+    HOMEBREW_PREFIX.join("Library", "Taps", "phinze-cask", "Casks")
   end
 
   def self.cellarpath