diff --git a/lib/routes.rb b/lib/routes.rb
index d01a1d5..bc92670 100644
--- a/lib/routes.rb
+++ b/lib/routes.rb
@@ -4,7 +4,7 @@ require 'haml'
 class Routes < Sinatra::Base
 
   set :views, Proc.new{
-    File.join root, '/../', 'pokes', 'views'
+    File.join Dir.pwd, 'pokes', 'views'
   }
   
   get 'custom/routes' do
diff --git a/lib/server.rb b/lib/server.rb
index 754e319..3a0d7e0 100644
--- a/lib/server.rb
+++ b/lib/server.rb
@@ -49,12 +49,12 @@ class Server < Routes
   post '/upload' do
     puts params
     FileUtils.copy(params[:data][:tempfile],
-                   "#{__dir__}/upload.tmp")
+                   "#{Dir.pwd}/upload.tmp")
     return 'OK'
   end
 
   get '/uploads' do
-    Fx::pipe(__dir__.concat('/upload.*'),
+    Fx::pipe(Dir.pwd.concat('/upload.*'),
              -> (t) { Dir.glob(t) },
              -> (t) {
                t.each { |f| File.delete f }