diff --git a/lib/sane.rb b/lib/sane.rb
index 061b3e6..8c43653 100644
--- a/lib/sane.rb
+++ b/lib/sane.rb
@@ -1,3 +1,13 @@
+require "singleton"
+require "forwardable"
+
+require "ffi"
+
+require "sane"
+require "sane/api"
+require "sane/error"
+require "sane/device"
+
 class Sane
   include Singleton
 
diff --git a/lib/sane/version.rb b/lib/sane/version.rb
new file mode 100644
index 0000000..478b082
--- /dev/null
+++ b/lib/sane/version.rb
@@ -0,0 +1,3 @@
+module Sane
+  VERSION = "0.1.0"
+end
diff --git a/lib/scanner.rb b/lib/scanner.rb
deleted file mode 100644
index 3e1a03b..0000000
--- a/lib/scanner.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require "singleton"
-require "forwardable"
-
-require "ffi"
-
-require "sane"
-require "sane/api"
-require "sane/error"
-require "sane/device"
-
-module Scanner
-
-end
diff --git a/lib/scanner/version.rb b/lib/scanner/version.rb
deleted file mode 100644
index 5bb45b9..0000000
--- a/lib/scanner/version.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-module Scanner
-  VERSION = "0.0.1"
-end
diff --git a/scanner.gemspec b/sane-ffi.gemspec
similarity index 82%
rename from scanner.gemspec
rename to sane-ffi.gemspec
index 02e67cb..ec8e638 100644
--- a/scanner.gemspec
+++ b/sane-ffi.gemspec
@@ -1,10 +1,10 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "scanner/version"
+require "sane/version"
 
 Gem::Specification.new do |s|
-  s.name        = "scanner"
-  s.version     = Scanner::VERSION
+  s.name        = "sane-ffi"
+  s.version     = Sane::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Jakub Kuźma"]
   s.email       = ["qoobaa@gmail.com"]
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.summary     = %q{SANE bindings}
   s.description = %q{Scanner Access now Easier}
 
-  # s.rubyforge_project = "scanner"
+  # s.rubyforge_project = "sane"
 
   s.add_dependency "ffi"