diff --git a/lib/sphinx-integration.rb b/lib/sphinx-integration.rb
index 7705a7b..6f529e9 100644
--- a/lib/sphinx-integration.rb
+++ b/lib/sphinx-integration.rb
@@ -1 +1 @@
-require 'sphinx_integration'
\ No newline at end of file
+require 'sphinx/integration'
\ No newline at end of file
diff --git a/lib/sphinx/integration.rb b/lib/sphinx/integration.rb
new file mode 100644
index 0000000..0c769d3
--- /dev/null
+++ b/lib/sphinx/integration.rb
@@ -0,0 +1,9 @@
+module Sphinx::Integration
+  autoload :SphinxHelper, 'sphinx/integration/sphinx_helper'
+  autoload :Mysql, 'sphinx/integration/mysql'
+  autoload :Transmitter, 'sphinx/integration/transmitter'
+end
+
+require 'sphinx/integration/version'
+require 'sphinx/integration/extensions'
+require 'sphinx/integration/railtie'
\ No newline at end of file
diff --git a/lib/sphinx/integration/extensions.rb b/lib/sphinx/integration/extensions.rb
new file mode 100644
index 0000000..c49ad33
--- /dev/null
+++ b/lib/sphinx/integration/extensions.rb
@@ -0,0 +1,13 @@
+module Sphinx::Integration::Extensions
+  autoload :ActiveRecord, 'sphinx/integration/extensions/active_record'
+  autoload :Attribute, 'sphinx/integration/extensions/attribute'
+  autoload :BundledSearch, 'sphinx/integration/extensions/bundled_search'
+  autoload :FastFacet, 'sphinx/integration/extensions/fast_facet'
+  autoload :Index, 'sphinx/integration/extensions/index'
+  autoload :PostgreSQLAdapter, 'sphinx/integration/extensions/postgresql_adapter'
+  autoload :Property, 'sphinx/integration/extensions/property'
+  autoload :Search, 'sphinx/integration/extensions/search'
+  autoload :Source, 'sphinx/integration/extensions/source'
+  autoload :ThinkingSphinx, 'sphinx/integration/extensions/thinking_sphinx'
+  autoload :Configuration, 'sphinx/integration/extensions/configuration'
+end
\ No newline at end of file
diff --git a/lib/sphinx_integration/extensions/active_record.rb b/lib/sphinx/integration/extensions/active_record.rb
similarity index 88%
rename from lib/sphinx_integration/extensions/active_record.rb
rename to lib/sphinx/integration/extensions/active_record.rb
index b71c697..3372111 100644
--- a/lib/sphinx_integration/extensions/active_record.rb
+++ b/lib/sphinx/integration/extensions/active_record.rb
@@ -1,9 +1,9 @@
 # coding: utf-8
-module SphinxIntegration::Extensions::ActiveRecord
+module Sphinx::Integration::Extensions::ActiveRecord
   extend ActiveSupport::Concern
 
   included do
-    include SphinxIntegration::Extensions::FastFacet
+    include Sphinx::Integration::Extensions::FastFacet
 
     delegate :create, :destroy, :update, :to => :transmitter, :prefix => true
 
@@ -15,7 +15,7 @@ module SphinxIntegration::Extensions::ActiveRecord
   module InstanceMethods
 
     def transmitter
-      @transmitter ||= SphinxIntegration::Transmitter.new(self)
+      @transmitter ||= Sphinx::Integration::Transmitter.new(self)
     end
 
   end
diff --git a/lib/sphinx_integration/extensions/attribute.rb b/lib/sphinx/integration/extensions/attribute.rb
similarity index 96%
rename from lib/sphinx_integration/extensions/attribute.rb
rename to lib/sphinx/integration/extensions/attribute.rb
index 09d0397..f3697b1 100644
--- a/lib/sphinx_integration/extensions/attribute.rb
+++ b/lib/sphinx/integration/extensions/attribute.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-module SphinxIntegration::Extensions::Attribute
+module Sphinx::Integration::Extensions::Attribute
   extend ActiveSupport::Concern
 
   included do
diff --git a/lib/sphinx_integration/extensions/bundled_search.rb b/lib/sphinx/integration/extensions/bundled_search.rb
similarity index 79%
rename from lib/sphinx_integration/extensions/bundled_search.rb
rename to lib/sphinx/integration/extensions/bundled_search.rb
index ee1be56..6d0a695 100644
--- a/lib/sphinx_integration/extensions/bundled_search.rb
+++ b/lib/sphinx/integration/extensions/bundled_search.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-module SphinxIntegration::Extensions::BundledSearch
+module Sphinx::Integration::Extensions::BundledSearch
   extend ActiveSupport::Concern
 
   included do
diff --git a/lib/sphinx_integration/extensions/configuration.rb b/lib/sphinx/integration/extensions/configuration.rb
similarity index 94%
rename from lib/sphinx_integration/extensions/configuration.rb
rename to lib/sphinx/integration/extensions/configuration.rb
index ffae537..b134ac3 100644
--- a/lib/sphinx_integration/extensions/configuration.rb
+++ b/lib/sphinx/integration/extensions/configuration.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-module SphinxIntegration::Extensions::Configuration
+module Sphinx::Integration::Extensions::Configuration
   extend ActiveSupport::Concern
 
   included do
diff --git a/lib/sphinx_integration/extensions/fast_facet.rb b/lib/sphinx/integration/extensions/fast_facet.rb
similarity index 96%
rename from lib/sphinx_integration/extensions/fast_facet.rb
rename to lib/sphinx/integration/extensions/fast_facet.rb
index 6d6356a..74fefe1 100644
--- a/lib/sphinx_integration/extensions/fast_facet.rb
+++ b/lib/sphinx/integration/extensions/fast_facet.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-module SphinxIntegration::Extensions::FastFacet
+module Sphinx::Integration::Extensions::FastFacet
   extend ActiveSupport::Concern
 
   module ClassMethods
diff --git a/lib/sphinx_integration/extensions/index.rb b/lib/sphinx/integration/extensions/index.rb
similarity index 95%
rename from lib/sphinx_integration/extensions/index.rb
rename to lib/sphinx/integration/extensions/index.rb
index 15a9a54..eb69428 100644
--- a/lib/sphinx_integration/extensions/index.rb
+++ b/lib/sphinx/integration/extensions/index.rb
@@ -1,8 +1,8 @@
 # coding: utf-8
-module SphinxIntegration::Extensions::Index
+module Sphinx::Integration::Extensions::Index
   extend ActiveSupport::Concern
 
-  autoload :Builder, 'sphinx_integration/extensions/index/builder'
+  autoload :Builder, 'sphinx/integration/extensions/index/builder'
 
   included do
     attr_accessor :merged_with_core, :is_core_index
diff --git a/lib/sphinx_integration/extensions/index/builder.rb b/lib/sphinx/integration/extensions/index/builder.rb
similarity index 77%
rename from lib/sphinx_integration/extensions/index/builder.rb
rename to lib/sphinx/integration/extensions/index/builder.rb
index 4ad1775..1d6c556 100644
--- a/lib/sphinx_integration/extensions/index/builder.rb
+++ b/lib/sphinx/integration/extensions/index/builder.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-module SphinxIntegration::Extensions::Index::Builder
+module Sphinx::Integration::Extensions::Index::Builder
 
   def group_by!(*args)
     source.groupings = args
diff --git a/lib/sphinx_integration/extensions/postgresql_adapter.rb b/lib/sphinx/integration/extensions/postgresql_adapter.rb
similarity index 88%
rename from lib/sphinx_integration/extensions/postgresql_adapter.rb
rename to lib/sphinx/integration/extensions/postgresql_adapter.rb
index e3fcc16..be5f913 100644
--- a/lib/sphinx_integration/extensions/postgresql_adapter.rb
+++ b/lib/sphinx/integration/extensions/postgresql_adapter.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-module SphinxIntegration::Extensions::PostgreSQLAdapter
+module Sphinx::Integration::Extensions::PostgreSQLAdapter
   extend ActiveSupport::Concern
 
   included do
diff --git a/lib/sphinx_integration/extensions/property.rb b/lib/sphinx/integration/extensions/property.rb
similarity index 85%
rename from lib/sphinx_integration/extensions/property.rb
rename to lib/sphinx/integration/extensions/property.rb
index 1d1c92b..48deb6c 100644
--- a/lib/sphinx_integration/extensions/property.rb
+++ b/lib/sphinx/integration/extensions/property.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-module SphinxIntegration::Extensions::Property
+module Sphinx::Integration::Extensions::Property
   extend ActiveSupport::Concern
 
   included do
diff --git a/lib/sphinx_integration/extensions/search.rb b/lib/sphinx/integration/extensions/search.rb
similarity index 87%
rename from lib/sphinx_integration/extensions/search.rb
rename to lib/sphinx/integration/extensions/search.rb
index b750595..4c16333 100644
--- a/lib/sphinx_integration/extensions/search.rb
+++ b/lib/sphinx/integration/extensions/search.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-module SphinxIntegration::Extensions::Search
+module Sphinx::Integration::Extensions::Search
   extend ActiveSupport::Concern
 
   included do
diff --git a/lib/sphinx_integration/extensions/source.rb b/lib/sphinx/integration/extensions/source.rb
similarity index 92%
rename from lib/sphinx_integration/extensions/source.rb
rename to lib/sphinx/integration/extensions/source.rb
index 6f74964..2b78a97 100644
--- a/lib/sphinx_integration/extensions/source.rb
+++ b/lib/sphinx/integration/extensions/source.rb
@@ -1,6 +1,6 @@
 # coding: utf-8
-module SphinxIntegration::Extensions::Source
-  autoload :SQL, 'sphinx_integration/extensions/source/sql'
+module Sphinx::Integration::Extensions::Source
+  autoload :SQL, 'sphinx/integration/extensions/source/sql'
   extend ActiveSupport::Concern
 
   included do
diff --git a/lib/sphinx_integration/extensions/source/sql.rb b/lib/sphinx/integration/extensions/source/sql.rb
similarity index 99%
rename from lib/sphinx_integration/extensions/source/sql.rb
rename to lib/sphinx/integration/extensions/source/sql.rb
index 8866f97..3db6074 100644
--- a/lib/sphinx_integration/extensions/source/sql.rb
+++ b/lib/sphinx/integration/extensions/source/sql.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-module SphinxIntegration::Extensions::Source::SQL
+module Sphinx::Integration::Extensions::Source::SQL
   extend ActiveSupport::Concern
 
   included do
diff --git a/lib/sphinx_integration/extensions/thinking_sphinx.rb b/lib/sphinx/integration/extensions/thinking_sphinx.rb
similarity index 72%
rename from lib/sphinx_integration/extensions/thinking_sphinx.rb
rename to lib/sphinx/integration/extensions/thinking_sphinx.rb
index 638afe4..1a7d2f9 100644
--- a/lib/sphinx_integration/extensions/thinking_sphinx.rb
+++ b/lib/sphinx/integration/extensions/thinking_sphinx.rb
@@ -1,10 +1,10 @@
 # coding: utf-8
-module SphinxIntegration::Extensions::ThinkingSphinx
+module Sphinx::Integration::Extensions::ThinkingSphinx
   extend ActiveSupport::Concern
 
   included do
     DEFAULT_MATCH = :extended2
-    include SphinxIntegration::Extensions::FastFacet
+    include Sphinx::Integration::Extensions::FastFacet
   end
 
   module ClassMethods
@@ -20,7 +20,7 @@ def reset_indexed_models
     end
 
     def take_connection
-      SphinxIntegration::Mysql::ConnectionPool.take do |connection|
+      Sphinx::Integration::Mysql::ConnectionPool.take do |connection|
         yield connection
       end
     end
diff --git a/lib/sphinx/integration/mysql.rb b/lib/sphinx/integration/mysql.rb
new file mode 100644
index 0000000..949b2fe
--- /dev/null
+++ b/lib/sphinx/integration/mysql.rb
@@ -0,0 +1,5 @@
+# coding: utf-8
+module Sphinx::Integration::Mysql
+  autoload :ConnectionPool, 'sphinx/integration/mysql/connection_pool'
+  autoload :Connection, 'sphinx/integration/mysql/connection'
+end
\ No newline at end of file
diff --git a/lib/sphinx_integration/mysql/connection.rb b/lib/sphinx/integration/mysql/connection.rb
similarity index 93%
rename from lib/sphinx_integration/mysql/connection.rb
rename to lib/sphinx/integration/mysql/connection.rb
index bd26336..4a8a97b 100644
--- a/lib/sphinx_integration/mysql/connection.rb
+++ b/lib/sphinx/integration/mysql/connection.rb
@@ -1,7 +1,7 @@
 # coding: utf-8
 require 'mysql2'
 
-class SphinxIntegration::Mysql::Connection
+class Sphinx::Integration::Mysql::Connection
   attr_reader :client
 
   def initialize(address, port, options)
diff --git a/lib/sphinx_integration/mysql/connection_pool.rb b/lib/sphinx/integration/mysql/connection_pool.rb
similarity index 84%
rename from lib/sphinx_integration/mysql/connection_pool.rb
rename to lib/sphinx/integration/mysql/connection_pool.rb
index bf6e475..56856c3 100644
--- a/lib/sphinx_integration/mysql/connection_pool.rb
+++ b/lib/sphinx/integration/mysql/connection_pool.rb
@@ -1,7 +1,7 @@
 # coding: utf-8
 require 'innertube'
 
-module SphinxIntegration::Mysql::ConnectionPool
+module Sphinx::Integration::Mysql::ConnectionPool
   def self.new_connection
     configuration = ThinkingSphinx::Configuration.instance.configuration
     # If you use localhost, MySQL insists on a socket connection, but Sphinx
@@ -17,12 +17,12 @@ def self.new_connection
       :port  => port
     }
 
-    SphinxIntegration::Mysql::Connection.new address, options[:port], options
+    Sphinx::Integration::Mysql::Connection.new address, options[:port], options
   end
 
   def self.pool
     @pool ||= Innertube::Pool.new(
-      Proc.new { SphinxIntegration::Mysql::ConnectionPool.new_connection },
+      Proc.new { Sphinx::Integration::Mysql::ConnectionPool.new_connection },
       Proc.new { |connection| connection.close }
     )
   end
diff --git a/lib/sphinx/integration/railtie.rb b/lib/sphinx/integration/railtie.rb
new file mode 100644
index 0000000..b799313
--- /dev/null
+++ b/lib/sphinx/integration/railtie.rb
@@ -0,0 +1,30 @@
+require 'rails'
+require 'thinking-sphinx'
+require 'sphinx-integration'
+
+module Sphinx::Integration
+  class Railtie < Rails::Railtie
+
+    initializer 'sphinx_integration.extensions', :after => 'thinking_sphinx.set_app_root' do
+      ThinkingSphinx.send :include, Extensions::ThinkingSphinx
+      ThinkingSphinx::Attribute.send :include, Sphinx::Integration::Extensions::Attribute
+      ThinkingSphinx::Source.send :include, Sphinx::Integration::Extensions::Source
+      ThinkingSphinx::Source.send :include, Sphinx::Integration::Extensions::Source::SQL
+      ThinkingSphinx::BundledSearch.send :include, Sphinx::Integration::Extensions::BundledSearch
+      ThinkingSphinx::Index::Builder.send :include, Sphinx::Integration::Extensions::Index::Builder
+      ThinkingSphinx::Property.send :include, Sphinx::Integration::Extensions::Property
+      ThinkingSphinx::Search.send :include, Sphinx::Integration::Extensions::Search
+      ThinkingSphinx::Index.send :include, Sphinx::Integration::Extensions::Index
+      ThinkingSphinx::Configuration.send :include, Sphinx::Integration::Extensions::Configuration
+      ThinkingSphinx::PostgreSQLAdapter.send :include, Sphinx::Integration::Extensions::PostgreSQLAdapter
+
+      ActiveSupport.on_load :active_record do
+        include Sphinx::Integration::Extensions::ActiveRecord
+      end
+    end
+
+    rake_tasks do
+      load 'sphinx/integration/tasks'
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/sphinx_integration/spec/support/thinking_sphinx.rb b/lib/sphinx/integration/spec/support/thinking_sphinx.rb
similarity index 92%
rename from lib/sphinx_integration/spec/support/thinking_sphinx.rb
rename to lib/sphinx/integration/spec/support/thinking_sphinx.rb
index 6113eda..85db91e 100644
--- a/lib/sphinx_integration/spec/support/thinking_sphinx.rb
+++ b/lib/sphinx/integration/spec/support/thinking_sphinx.rb
@@ -4,7 +4,7 @@
 require 'database_cleaner'
 require 'benchmark'
 
-class SphinxIntegration::Spec::Support::ThinkingSphinx
+class Sphinx::Integration::Spec::Support::ThinkingSphinx
   def reindex
     time = Benchmark.realtime do
       if remote?
@@ -24,7 +24,7 @@ def remote?
 end
 
 def with_sphinx(tables = nil)
-  sphinx  = SphinxIntegration::Spec::Support::ThinkingSphinx.new
+  sphinx  = Sphinx::Integration::Spec::Support::ThinkingSphinx.new
   context = self
 
   begin
diff --git a/lib/sphinx_integration/sphinx_helper.rb b/lib/sphinx/integration/sphinx_helper.rb
similarity index 98%
rename from lib/sphinx_integration/sphinx_helper.rb
rename to lib/sphinx/integration/sphinx_helper.rb
index bea4cbc..736e0ba 100644
--- a/lib/sphinx_integration/sphinx_helper.rb
+++ b/lib/sphinx/integration/sphinx_helper.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-module SphinxIntegration
+module Sphinx::Integration
   class SphinxHelper
     module ClassMethods
       def remote_sphinx?
diff --git a/lib/sphinx_integration/tasks.rb b/lib/sphinx/integration/tasks.rb
similarity index 69%
rename from lib/sphinx_integration/tasks.rb
rename to lib/sphinx/integration/tasks.rb
index dac1275..8b0b0a4 100644
--- a/lib/sphinx_integration/tasks.rb
+++ b/lib/sphinx/integration/tasks.rb
@@ -12,26 +12,26 @@ def wrap_task(name, &block)
   end
 
   wrap_task :stop do |orig_block|
-    SphinxIntegration::Helper.stop
+    Sphinx::Integration::Helper.stop
   end
 
   wrap_task :start do |orig_block|
-    SphinxIntegration::Helper.start
+    Sphinx::Integration::Helper.start
   end
 
   wrap_task :running_start do |orig_block|
-    SphinxIntegration::Helper.running_start
+    Sphinx::Integration::Helper.running_start
   end
 
   wrap_task :index do |orig_block|
-    SphinxIntegration::Helper.index
+    Sphinx::Integration::Helper.index
   end
 
   wrap_task :reindex do |orig_block|
-    SphinxIntegration::Helper.reindex
+    Sphinx::Integration::Helper.reindex
   end
 
   wrap_task :rebuild do |orig_block|
-    SphinxIntegration::Helper.reindex
+    Sphinx::Integration::Helper.reindex
   end
 end
\ No newline at end of file
diff --git a/lib/sphinx_integration/transmitter.rb b/lib/sphinx/integration/transmitter.rb
similarity index 98%
rename from lib/sphinx_integration/transmitter.rb
rename to lib/sphinx/integration/transmitter.rb
index 3c69829..24aacf7 100644
--- a/lib/sphinx_integration/transmitter.rb
+++ b/lib/sphinx/integration/transmitter.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-module SphinxIntegration
+module Sphinx::Integration
   class Transmitter
     attr_reader :record
 
diff --git a/lib/sphinx/integration/version.rb b/lib/sphinx/integration/version.rb
new file mode 100644
index 0000000..01e957b
--- /dev/null
+++ b/lib/sphinx/integration/version.rb
@@ -0,0 +1,3 @@
+module Sphinx::Integration
+  VERSION = "0.0.1"
+end
diff --git a/lib/sphinx_integration.rb b/lib/sphinx_integration.rb
deleted file mode 100644
index e8d66fe..0000000
--- a/lib/sphinx_integration.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-module SphinxIntegration
-  autoload :SphinxHelper, 'sphinx_integration/sphinx_helper'
-  autoload :Mysql, 'sphinx_integration/mysql'
-  autoload :Transmitter, 'sphinx_integration/transmitter'
-end
-
-require 'sphinx_integration/version'
-require 'sphinx_integration/extensions'
-require 'sphinx_integration/railtie'
\ No newline at end of file
diff --git a/lib/sphinx_integration/extensions.rb b/lib/sphinx_integration/extensions.rb
deleted file mode 100644
index 2e89869..0000000
--- a/lib/sphinx_integration/extensions.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-module SphinxIntegration::Extensions
-  autoload :ActiveRecord, 'sphinx_integration/extensions/active_record'
-  autoload :Attribute, 'sphinx_integration/extensions/attribute'
-  autoload :BundledSearch, 'sphinx_integration/extensions/bundled_search'
-  autoload :FastFacet, 'sphinx_integration/extensions/fast_facet'
-  autoload :Index, 'sphinx_integration/extensions/index'
-  autoload :PostgreSQLAdapter, 'sphinx_integration/extensions/postgresql_adapter'
-  autoload :Property, 'sphinx_integration/extensions/property'
-  autoload :Search, 'sphinx_integration/extensions/search'
-  autoload :Source, 'sphinx_integration/extensions/source'
-  autoload :ThinkingSphinx, 'sphinx_integration/extensions/thinking_sphinx'
-  autoload :Configuration, 'sphinx_integration/extensions/configuration'
-end
\ No newline at end of file
diff --git a/lib/sphinx_integration/mysql.rb b/lib/sphinx_integration/mysql.rb
deleted file mode 100644
index 534bf69..0000000
--- a/lib/sphinx_integration/mysql.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# coding: utf-8
-module SphinxIntegration::Mysql
-  autoload :ConnectionPool, 'sphinx_integration/mysql/connection_pool'
-  autoload :Connection, 'sphinx_integration/mysql/connection'
-end
\ No newline at end of file
diff --git a/lib/sphinx_integration/railtie.rb b/lib/sphinx_integration/railtie.rb
deleted file mode 100644
index c8ad312..0000000
--- a/lib/sphinx_integration/railtie.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-require 'sphinx_integration'
-require 'rails'
-require 'thinking-sphinx'
-
-module SphinxIntegration
-  class Railtie < Rails::Railtie
-
-    initializer 'sphinx_integration.extensions', :after => 'thinking_sphinx.set_app_root' do
-      ThinkingSphinx.send :include, Extensions::ThinkingSphinx
-      ThinkingSphinx::Attribute.send :include, SphinxIntegration::Extensions::Attribute
-      ThinkingSphinx::Source.send :include, SphinxIntegration::Extensions::Source
-      ThinkingSphinx::Source.send :include, SphinxIntegration::Extensions::Source::SQL
-      ThinkingSphinx::BundledSearch.send :include, SphinxIntegration::Extensions::BundledSearch
-      ThinkingSphinx::Index::Builder.send :include, SphinxIntegration::Extensions::Index::Builder
-      ThinkingSphinx::Property.send :include, SphinxIntegration::Extensions::Property
-      ThinkingSphinx::Search.send :include, SphinxIntegration::Extensions::Search
-      ThinkingSphinx::Index.send :include, SphinxIntegration::Extensions::Index
-      ThinkingSphinx::Configuration.send :include, SphinxIntegration::Extensions::Configuration
-      ThinkingSphinx::PostgreSQLAdapter.send :include, SphinxIntegration::Extensions::PostgreSQLAdapter
-
-      ActiveSupport.on_load :active_record do
-        include SphinxIntegration::Extensions::ActiveRecord
-      end
-    end
-
-    rake_tasks do
-      load File.expand_path('../tasks.rb', __FILE__)
-    end
-  end
-end
\ No newline at end of file
diff --git a/lib/sphinx_integration/version.rb b/lib/sphinx_integration/version.rb
deleted file mode 100644
index 99be8d2..0000000
--- a/lib/sphinx_integration/version.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-module SphinxIntegration
-  VERSION = "0.0.1"
-end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 6bef369..2e40a68 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,11 +1,11 @@
 require 'rubygems'
 require 'bundler'
 #require 'rspec'
-#require 'sphinx_integration'
+#require 'sphinx/integration'
 
 Bundler.require :default, :development
 
-require 'sphinx_integration/railtie'
+require 'sphinx/integration/railtie'
 
 Combustion.initialize! :active_record
 
diff --git a/spec/sphinx_integration/extensions/active_record_spec.rb b/spec/sphinx/integration/extensions/active_record_spec.rb
similarity index 96%
rename from spec/sphinx_integration/extensions/active_record_spec.rb
rename to spec/sphinx/integration/extensions/active_record_spec.rb
index ca5f55d..a226dc8 100644
--- a/spec/sphinx_integration/extensions/active_record_spec.rb
+++ b/spec/sphinx/integration/extensions/active_record_spec.rb
@@ -1,7 +1,7 @@
 # coding: utf-8
 require 'spec_helper'
 
-describe 'ActiveRecord::Base extension' do
+describe ActiveRecord::Base do
 
   before(:all){ ThinkingSphinx.context.define_indexes }
 
diff --git a/spec/sphinx_integration/extensions/attribute_spec.rb b/spec/sphinx/integration/extensions/attribute_spec.rb
similarity index 94%
rename from spec/sphinx_integration/extensions/attribute_spec.rb
rename to spec/sphinx/integration/extensions/attribute_spec.rb
index 036096d..8802cf4 100644
--- a/spec/sphinx_integration/extensions/attribute_spec.rb
+++ b/spec/sphinx/integration/extensions/attribute_spec.rb
@@ -1,7 +1,7 @@
 # coding: utf-8
 require 'spec_helper'
 
-describe 'specifying SQL for attribute definition' do
+describe ThinkingSphinx::Attribute do
 
   describe '#source_value' do
     it 'generate custom sql' do
diff --git a/spec/sphinx_integration/extensions/index_spec.rb b/spec/sphinx/integration/extensions/index_spec.rb
similarity index 96%
rename from spec/sphinx_integration/extensions/index_spec.rb
rename to spec/sphinx/integration/extensions/index_spec.rb
index ca121fd..7fc5b32 100644
--- a/spec/sphinx_integration/extensions/index_spec.rb
+++ b/spec/sphinx/integration/extensions/index_spec.rb
@@ -1,7 +1,7 @@
 # coding: utf-8
 require 'spec_helper'
 
-describe 'ThinkingSphinx Index extension' do
+describe ThinkingSphinx::Index do
 
   let(:index) do
     index = ThinkingSphinx::Index::Builder.generate(ModelWithDisk, nil) do
diff --git a/spec/sphinx_integration/extensions/source/sql_spec.rb b/spec/sphinx/integration/extensions/source/sql_spec.rb
similarity index 98%
rename from spec/sphinx_integration/extensions/source/sql_spec.rb
rename to spec/sphinx/integration/extensions/source/sql_spec.rb
index c5a4644..c13b3eb 100644
--- a/spec/sphinx_integration/extensions/source/sql_spec.rb
+++ b/spec/sphinx/integration/extensions/source/sql_spec.rb
@@ -1,7 +1,7 @@
 # coding: utf-8
 require 'spec_helper'
 
-describe 'specifying SQL for index definition' do
+describe ThinkingSphinx::Source::SQL do
 
   describe '#sql_query_info' do
     it 'generate default table name' do
diff --git a/spec/sphinx_integration/extensions/source_spec.rb b/spec/sphinx/integration/extensions/source_spec.rb
similarity index 100%
rename from spec/sphinx_integration/extensions/source_spec.rb
rename to spec/sphinx/integration/extensions/source_spec.rb
diff --git a/sphinx-integration.gemspec b/sphinx-integration.gemspec
index 7c440e2..1ea710d 100644
--- a/sphinx-integration.gemspec
+++ b/sphinx-integration.gemspec
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'sphinx_integration/version'
+require 'sphinx/integration/version'
 
 Gem::Specification.new do |gem|
   gem.name          = 'sphinx-integration'