diff --git a/ruby/kwikemon.gemspec b/ruby/kwikemon.gemspec
index 6a1b228..c70543b 100644
--- a/ruby/kwikemon.gemspec
+++ b/ruby/kwikemon.gemspec
@@ -1,5 +1,5 @@
-$LOAD_PATH << File.expand_path("../", __FILE__)
-require 'version'
+$LOAD_PATH << File.expand_path('../lib', __FILE__)
+require 'kwikemon/version'
 
 Gem::Specification.new do |s|
   s.name = 'kwikemon'
@@ -10,7 +10,8 @@ Gem::Specification.new do |s|
   s.author = 'Sami Samhuri'
   s.email = 'sami@samhuri.net'
   s.homepage = 'https://github.com/samsonjs/kwikemon'
-  s.files = ['kwikemon.rb', 'monitor.rb']
+  s.require_path = './lib'
+  s.files = ['lib/kwikemon.rb', 'lib/kwikemon/monitor.rb', 'lib/kwikemon/version.rb']
   s.add_dependency 'redis', '~> 3.0.4'
   s.required_ruby_version = '>= 1.9.1'
 end
diff --git a/ruby/kwikemon.rb b/ruby/lib/kwikemon.rb
similarity index 93%
rename from ruby/kwikemon.rb
rename to ruby/lib/kwikemon.rb
index f28ab1d..0f7a250 100644
--- a/ruby/kwikemon.rb
+++ b/ruby/lib/kwikemon.rb
@@ -3,10 +3,14 @@
 # MIT License
 # http://sjs.mit-license.org
 
+lib_dir = File.expand_path('../', __FILE__)
+$LOAD_PATH << lib_dir unless $LOAD_PATH.include?(lib_dir)
+
 require 'hashie'
 require 'redis'
 require 'toml'
-require File.expand_path('../monitor.rb', __FILE__)
+require 'kwikemon/monitor'
+require 'kwikemon/version'
 
 module Kwikemon
 
diff --git a/ruby/monitor.rb b/ruby/lib/kwikemon/monitor.rb
similarity index 100%
rename from ruby/monitor.rb
rename to ruby/lib/kwikemon/monitor.rb
diff --git a/ruby/version.rb b/ruby/lib/kwikemon/version.rb
similarity index 50%
rename from ruby/version.rb
rename to ruby/lib/kwikemon/version.rb
index a0ce167..aee50ae 100644
--- a/ruby/version.rb
+++ b/ruby/lib/kwikemon/version.rb
@@ -1,3 +1,3 @@
 module Kwikemon
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end