diff --git a/.document b/.document
new file mode 100644
index 0000000..3d618dd
--- /dev/null
+++ b/.document
@@ -0,0 +1,5 @@
+lib/**/*.rb
+bin/*
+- 
+features/**/*.feature
+LICENSE.txt
diff --git a/.gitignore b/.gitignore
index e11791c..e6a2340 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,54 @@
-*.html
-Makefile
-bdbxml2/bdbxml_features.h
-bdbxml[12]/*.html
-bdbxml[12]/*.so
-bdbxml[12]/docs/*.html
-docs/*.html
-src/Makefile
-src/bdb.so
-src/bdb_features.h
-src/mkmf.log
+# rcov generated
+coverage
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# jeweler generated
+pkg
+
+# rake-compiler generated
+tmp
+
+# We have no files under lib at the moment.
+lib
+
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
+#
+# * Create a file at ~/.gitignore
+# * Include files you want ignored
+# * Run: git config --global core.excludesfile ~/.gitignore
+#
+# After doing this, these files will be ignored in all your git projects,
+# saving you from having to 'pollute' every project you touch with them
+#
+# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
+#
+# For MacOS:
+#
+#.DS_Store
+
+# For TextMate
+#*.tmproj
+#tmtags
+
+# For emacs:
+#*~
+#\#*
+#.\#*
+
+# For vim:
+#*.swp
+
+# For redcar:
+#.redcar
+
+# For rubinius:
+#*.rbc
diff --git a/Changes b/Changes
index 95d834d..f2f8a00 100644
--- a/Changes
+++ b/Changes
@@ -289,3 +289,7 @@
 --- 0.6.6
 
 * ruby 1.9 support
+
+--- 0.6.7
+
+* gemified.
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..7b71234
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,13 @@
+source "http://rubygems.org"
+# Add dependencies required to use your gem here.
+# Example:
+#   gem "activesupport", ">= 2.3.5"
+
+# Add dependencies to develop your gem here.
+# Include everything needed to run rake, tests, features, etc.
+group :development do
+  gem "bundler", "~> 1.0.0"
+  gem "jeweler", "~> 1.6.4"
+  gem "rcov", ">= 0"
+  gem "rake-compiler", ">= 0.7.9"
+end
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 0000000..1507e2a
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,21 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    git (1.2.5)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+    rake (0.9.2.2)
+    rake-compiler (0.7.9)
+      rake
+    rcov (0.9.11)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.0.0)
+  jeweler (~> 1.6.4)
+  rake-compiler (>= 0.7.9)
+  rcov
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 0000000..0db309f
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,3 @@
+Copyright (c) 2011 Akinori MUSHA
+
+You can redistribute it and/or modify it under the same term as Ruby.
diff --git a/README.en b/README.en
deleted file mode 100644
index c35ca6f..0000000
--- a/README.en
+++ /dev/null
@@ -1,69 +0,0 @@
-
- This is an interface to Berkeley DB, distributed by Sleepycat
- (http://www.sleepycat.com/)
-
-* Prerequisite
-
-  db >= 2 (some functionnality like join are not available with db < 2.6)
-
-  For Berkeley DB 1.85 and 1.86 see bdb1
-
-* Installation
- 
-   ruby extconf.rb
-   make
-   make install
- 
- You may need to specify :
-
-  --with-db-include=<include file directory for bdb>
-
-  --with-db-lib=<library directory for bdb>
-
-  --with-db-dir=<prefix for library and include of bdb>
-
-  --enable-db-xml
-
-  --help
-
- Example :
- 
-  ruby extconf.rb --with-db-dir=/home/ts/local
-
-* WARNING
-
-  With bdb >= 0.5.5 `nil' is stored as an empty string (when marshal is not
-  used).
-
-  Open the database with
-
-     "store_nil_as_null" => true
-
-  if you want the old behavior (`nil' stored as `\000')
-
-
-* examples 
-
-  examples/basic.rb        simple access method
-  examples/recno.rb        access to flat file
-  examples/cursor.rb       direct cursor access
-  examples/txn.rb          transaction
-  examples/join.rb         join (need db >= 2.6)
-  examples/log.rb          log file
-
-* Documentation : see bdb.rd and bdb.html
-
-* Tests : if you have rubyunit, or testunit
-
-   make test
- 
-* Copying
- 
- This extension module is copyrighted free software by Guy Decoux
- 
- You can redistribute it and/or modify it under the same term as
- Ruby.
-
- 
- 
-Guy Decoux <ts@moulon.inra.fr>
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..cd721ad
--- /dev/null
+++ b/README.md
@@ -0,0 +1,76 @@
+bdb1
+====
+
+Synopsis
+--------
+
+A Ruby interface to Berkeley DB distributed by Oracle
+
+Prerequisite
+============
+
+* db >= 2 (some functionnality like join are not available with db < 2.6)
+
+For Berkeley DB 1.85 and 1.86 see bdb1
+
+Examples
+--------
+
+See the `examples` directory for code examples.
+
+Installation
+------------
+
+You can install this module simply by:
+
+	gem install bdb
+
+Use the `--with-db-dir=$prefix` option to specify with which libdb
+this extension should be linked.
+
+Notes
+=====
+
+With bdb >= 0.5.5 `nil' is stored as an empty string (when marshal is
+not used).
+
+Open the database with
+
+    "store_nil_as_null" => true
+
+if you want the old behavior (`nil' stored as `\000').
+
+Examples
+========
+
+* examples/basic.rb
+
+  simple access method
+
+* examples/recno.rb
+
+  access to flat file
+
+* examples/cursor.rb
+
+  direct cursor access
+
+* examples/txn.rb
+
+  transaction
+
+* examples/join.rb
+
+  join (need db >= 2.6)
+
+* examples/log.rb
+
+  log file
+
+License
+-------
+
+Copyright (c) 2000-2008 Guy Decoux
+Copyright (c) 2008-2011 Akinori MUSHA
+
+You can redistribute it and/or modify it under the same term as Ruby.
diff --git a/Rakefile b/Rakefile
new file mode 100644
index 0000000..a0eec2e
--- /dev/null
+++ b/Rakefile
@@ -0,0 +1,65 @@
+# encoding: utf-8
+
+require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+require 'rake'
+
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+  gem.name = "bdb"
+  gem.homepage = "http://github.com/knu/ruby-bdb"
+  gem.license = "Ruby's"
+  gem.summary = %Q{A Ruby interface to Berkeley DB >= 2.0}
+  gem.description = %Q{This is a Ruby interface to Berkeley DB >= 2.0.}
+  gem.email = "knu@idaemons.org"
+  gem.authors = ["Guy Decoux", "Akinori MUSHA"]
+  # dependencies defined in Gemfile
+end
+Jeweler::RubygemsDotOrgTasks.new
+
+def generated_gemspec
+  eval(File.read(Rake.application.jeweler.gemspec_helper.path))
+rescue
+  nil
+end
+
+require 'rake/extensiontask'
+Rake::ExtensionTask.new('bdb', generated_gemspec) do |ext|
+    ext.cross_compile = true
+    ext.cross_platform = 'x86-mingw32'
+end
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end
+
+require 'rcov/rcovtask'
+Rcov::RcovTask.new do |test|
+  test.libs << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+  test.rcov_opts << '--exclude "gems/*"'
+end
+
+task :default => :test
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "bdb #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
diff --git a/VERSION b/VERSION
new file mode 100644
index 0000000..8b707c6
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+0.6.7
\ No newline at end of file
diff --git a/src/bdb.c b/ext/bdb/bdb.c
similarity index 100%
rename from src/bdb.c
rename to ext/bdb/bdb.c
diff --git a/src/bdb.h b/ext/bdb/bdb.h
similarity index 100%
rename from src/bdb.h
rename to ext/bdb/bdb.h
diff --git a/src/common.c b/ext/bdb/common.c
similarity index 100%
rename from src/common.c
rename to ext/bdb/common.c
diff --git a/src/cursor.c b/ext/bdb/cursor.c
similarity index 100%
rename from src/cursor.c
rename to ext/bdb/cursor.c
diff --git a/src/delegator.c b/ext/bdb/delegator.c
similarity index 100%
rename from src/delegator.c
rename to ext/bdb/delegator.c
diff --git a/src/env.c b/ext/bdb/env.c
similarity index 100%
rename from src/env.c
rename to ext/bdb/env.c
diff --git a/src/extconf.rb b/ext/bdb/extconf.rb
similarity index 100%
rename from src/extconf.rb
rename to ext/bdb/extconf.rb
diff --git a/src/features.rb b/ext/bdb/features.rb
similarity index 100%
rename from src/features.rb
rename to ext/bdb/features.rb
diff --git a/src/lock.c b/ext/bdb/lock.c
similarity index 100%
rename from src/lock.c
rename to ext/bdb/lock.c
diff --git a/src/log.c b/ext/bdb/log.c
similarity index 100%
rename from src/log.c
rename to ext/bdb/log.c
diff --git a/src/recnum.c b/ext/bdb/recnum.c
similarity index 100%
rename from src/recnum.c
rename to ext/bdb/recnum.c
diff --git a/src/sequence.c b/ext/bdb/sequence.c
similarity index 100%
rename from src/sequence.c
rename to ext/bdb/sequence.c
diff --git a/src/transaction.c b/ext/bdb/transaction.c
similarity index 100%
rename from src/transaction.c
rename to ext/bdb/transaction.c
diff --git a/bdbxml1/Changes b/ext/bdbxml1/Changes
similarity index 100%
rename from bdbxml1/Changes
rename to ext/bdbxml1/Changes
diff --git a/bdbxml1/README.en b/ext/bdbxml1/README.en
similarity index 100%
rename from bdbxml1/README.en
rename to ext/bdbxml1/README.en
diff --git a/bdbxml1/b.rb b/ext/bdbxml1/b.rb
similarity index 100%
rename from bdbxml1/b.rb
rename to ext/bdbxml1/b.rb
diff --git a/bdbxml1/bdbxml.cc b/ext/bdbxml1/bdbxml.cc
similarity index 100%
rename from bdbxml1/bdbxml.cc
rename to ext/bdbxml1/bdbxml.cc
diff --git a/bdbxml1/bdbxml.h b/ext/bdbxml1/bdbxml.h
similarity index 100%
rename from bdbxml1/bdbxml.h
rename to ext/bdbxml1/bdbxml.h
diff --git a/bdbxml1/bdbxml.rd b/ext/bdbxml1/bdbxml.rd
similarity index 100%
rename from bdbxml1/bdbxml.rd
rename to ext/bdbxml1/bdbxml.rd
diff --git a/bdbxml1/docs/bdbxml.rb b/ext/bdbxml1/docs/bdbxml.rb
similarity index 100%
rename from bdbxml1/docs/bdbxml.rb
rename to ext/bdbxml1/docs/bdbxml.rb
diff --git a/bdbxml1/docs/container.rb b/ext/bdbxml1/docs/container.rb
similarity index 100%
rename from bdbxml1/docs/container.rb
rename to ext/bdbxml1/docs/container.rb
diff --git a/bdbxml1/docs/container.rd b/ext/bdbxml1/docs/container.rd
similarity index 100%
rename from bdbxml1/docs/container.rd
rename to ext/bdbxml1/docs/container.rd
diff --git a/bdbxml1/docs/context.rb b/ext/bdbxml1/docs/context.rb
similarity index 100%
rename from bdbxml1/docs/context.rb
rename to ext/bdbxml1/docs/context.rb
diff --git a/bdbxml1/docs/context.rd b/ext/bdbxml1/docs/context.rd
similarity index 100%
rename from bdbxml1/docs/context.rd
rename to ext/bdbxml1/docs/context.rd
diff --git a/bdbxml1/docs/document.rb b/ext/bdbxml1/docs/document.rb
similarity index 100%
rename from bdbxml1/docs/document.rb
rename to ext/bdbxml1/docs/document.rb
diff --git a/bdbxml1/docs/document.rd b/ext/bdbxml1/docs/document.rd
similarity index 100%
rename from bdbxml1/docs/document.rd
rename to ext/bdbxml1/docs/document.rd
diff --git a/bdbxml1/docs/index.rb b/ext/bdbxml1/docs/index.rb
similarity index 100%
rename from bdbxml1/docs/index.rb
rename to ext/bdbxml1/docs/index.rb
diff --git a/bdbxml1/docs/index.rd b/ext/bdbxml1/docs/index.rd
similarity index 100%
rename from bdbxml1/docs/index.rd
rename to ext/bdbxml1/docs/index.rd
diff --git a/bdbxml1/docs/modify.rb b/ext/bdbxml1/docs/modify.rb
similarity index 100%
rename from bdbxml1/docs/modify.rb
rename to ext/bdbxml1/docs/modify.rb
diff --git a/bdbxml1/docs/modify.rd b/ext/bdbxml1/docs/modify.rd
similarity index 100%
rename from bdbxml1/docs/modify.rd
rename to ext/bdbxml1/docs/modify.rd
diff --git a/bdbxml1/docs/results.rb b/ext/bdbxml1/docs/results.rb
similarity index 100%
rename from bdbxml1/docs/results.rb
rename to ext/bdbxml1/docs/results.rb
diff --git a/bdbxml1/docs/results.rd b/ext/bdbxml1/docs/results.rd
similarity index 100%
rename from bdbxml1/docs/results.rd
rename to ext/bdbxml1/docs/results.rd
diff --git a/bdbxml1/examples/dbxml/README b/ext/bdbxml1/examples/dbxml/README
similarity index 100%
rename from bdbxml1/examples/dbxml/README
rename to ext/bdbxml1/examples/dbxml/README
diff --git a/bdbxml1/examples/dbxml/a.sh b/ext/bdbxml1/examples/dbxml/a.sh
similarity index 100%
rename from bdbxml1/examples/dbxml/a.sh
rename to ext/bdbxml1/examples/dbxml/a.sh
diff --git a/bdbxml1/examples/dbxml/add_index.rb b/ext/bdbxml1/examples/dbxml/add_index.rb
similarity index 100%
rename from bdbxml1/examples/dbxml/add_index.rb
rename to ext/bdbxml1/examples/dbxml/add_index.rb
diff --git a/bdbxml1/examples/dbxml/build_db.rb b/ext/bdbxml1/examples/dbxml/build_db.rb
similarity index 100%
rename from bdbxml1/examples/dbxml/build_db.rb
rename to ext/bdbxml1/examples/dbxml/build_db.rb
diff --git a/bdbxml1/examples/dbxml/context.rb b/ext/bdbxml1/examples/dbxml/context.rb
similarity index 100%
rename from bdbxml1/examples/dbxml/context.rb
rename to ext/bdbxml1/examples/dbxml/context.rb
diff --git a/bdbxml1/examples/dbxml/delete.rb b/ext/bdbxml1/examples/dbxml/delete.rb
similarity index 100%
rename from bdbxml1/examples/dbxml/delete.rb
rename to ext/bdbxml1/examples/dbxml/delete.rb
diff --git a/bdbxml1/examples/dbxml/delete_index.rb b/ext/bdbxml1/examples/dbxml/delete_index.rb
similarity index 100%
rename from bdbxml1/examples/dbxml/delete_index.rb
rename to ext/bdbxml1/examples/dbxml/delete_index.rb
diff --git a/bdbxml1/examples/dbxml/document.rb b/ext/bdbxml1/examples/dbxml/document.rb
similarity index 100%
rename from bdbxml1/examples/dbxml/document.rb
rename to ext/bdbxml1/examples/dbxml/document.rb
diff --git a/bdbxml1/examples/dbxml/load.rb b/ext/bdbxml1/examples/dbxml/load.rb
similarity index 100%
rename from bdbxml1/examples/dbxml/load.rb
rename to ext/bdbxml1/examples/dbxml/load.rb
diff --git a/bdbxml1/examples/dbxml/loadex.rb b/ext/bdbxml1/examples/dbxml/loadex.rb
similarity index 100%
rename from bdbxml1/examples/dbxml/loadex.rb
rename to ext/bdbxml1/examples/dbxml/loadex.rb
diff --git a/bdbxml1/examples/dbxml/metadata.rb b/ext/bdbxml1/examples/dbxml/metadata.rb
similarity index 100%
rename from bdbxml1/examples/dbxml/metadata.rb
rename to ext/bdbxml1/examples/dbxml/metadata.rb
diff --git a/bdbxml1/examples/dbxml/names.rb b/ext/bdbxml1/examples/dbxml/names.rb
similarity index 100%
rename from bdbxml1/examples/dbxml/names.rb
rename to ext/bdbxml1/examples/dbxml/names.rb
diff --git a/bdbxml1/examples/dbxml/query.rb b/ext/bdbxml1/examples/dbxml/query.rb
similarity index 100%
rename from bdbxml1/examples/dbxml/query.rb
rename to ext/bdbxml1/examples/dbxml/query.rb
diff --git a/bdbxml1/examples/dbxml/replace_index.rb b/ext/bdbxml1/examples/dbxml/replace_index.rb
similarity index 100%
rename from bdbxml1/examples/dbxml/replace_index.rb
rename to ext/bdbxml1/examples/dbxml/replace_index.rb
diff --git a/bdbxml1/examples/dbxml/retrieve_db.rb b/ext/bdbxml1/examples/dbxml/retrieve_db.rb
similarity index 100%
rename from bdbxml1/examples/dbxml/retrieve_db.rb
rename to ext/bdbxml1/examples/dbxml/retrieve_db.rb
diff --git a/bdbxml1/examples/dbxml/update.rb b/ext/bdbxml1/examples/dbxml/update.rb
similarity index 100%
rename from bdbxml1/examples/dbxml/update.rb
rename to ext/bdbxml1/examples/dbxml/update.rb
diff --git a/bdbxml1/examples/index.rb b/ext/bdbxml1/examples/index.rb
similarity index 100%
rename from bdbxml1/examples/index.rb
rename to ext/bdbxml1/examples/index.rb
diff --git a/bdbxml1/examples/transaction.rb b/ext/bdbxml1/examples/transaction.rb
similarity index 100%
rename from bdbxml1/examples/transaction.rb
rename to ext/bdbxml1/examples/transaction.rb
diff --git a/bdbxml1/extconf.rb b/ext/bdbxml1/extconf.rb
similarity index 100%
rename from bdbxml1/extconf.rb
rename to ext/bdbxml1/extconf.rb
diff --git a/bdbxml1/glossary/README b/ext/bdbxml1/glossary/README
similarity index 100%
rename from bdbxml1/glossary/README
rename to ext/bdbxml1/glossary/README
diff --git a/bdbxml1/glossary/abstract_data_type b/ext/bdbxml1/glossary/abstract_data_type
similarity index 100%
rename from bdbxml1/glossary/abstract_data_type
rename to ext/bdbxml1/glossary/abstract_data_type
diff --git a/bdbxml1/glossary/associative_array b/ext/bdbxml1/glossary/associative_array
similarity index 100%
rename from bdbxml1/glossary/associative_array
rename to ext/bdbxml1/glossary/associative_array
diff --git a/bdbxml1/glossary/awk b/ext/bdbxml1/glossary/awk
similarity index 100%
rename from bdbxml1/glossary/awk
rename to ext/bdbxml1/glossary/awk
diff --git a/bdbxml1/glossary/big_endian b/ext/bdbxml1/glossary/big_endian
similarity index 100%
rename from bdbxml1/glossary/big_endian
rename to ext/bdbxml1/glossary/big_endian
diff --git a/bdbxml1/glossary/block b/ext/bdbxml1/glossary/block
similarity index 100%
rename from bdbxml1/glossary/block
rename to ext/bdbxml1/glossary/block
diff --git a/bdbxml1/glossary/bug b/ext/bdbxml1/glossary/bug
similarity index 100%
rename from bdbxml1/glossary/bug
rename to ext/bdbxml1/glossary/bug
diff --git a/bdbxml1/glossary/built-in_class b/ext/bdbxml1/glossary/built-in_class
similarity index 100%
rename from bdbxml1/glossary/built-in_class
rename to ext/bdbxml1/glossary/built-in_class
diff --git a/bdbxml1/glossary/byte_order b/ext/bdbxml1/glossary/byte_order
similarity index 100%
rename from bdbxml1/glossary/byte_order
rename to ext/bdbxml1/glossary/byte_order
diff --git a/bdbxml1/glossary/class b/ext/bdbxml1/glossary/class
similarity index 100%
rename from bdbxml1/glossary/class
rename to ext/bdbxml1/glossary/class
diff --git a/bdbxml1/glossary/class_method b/ext/bdbxml1/glossary/class_method
similarity index 100%
rename from bdbxml1/glossary/class_method
rename to ext/bdbxml1/glossary/class_method
diff --git a/bdbxml1/glossary/coerce b/ext/bdbxml1/glossary/coerce
similarity index 100%
rename from bdbxml1/glossary/coerce
rename to ext/bdbxml1/glossary/coerce
diff --git a/bdbxml1/glossary/constant b/ext/bdbxml1/glossary/constant
similarity index 100%
rename from bdbxml1/glossary/constant
rename to ext/bdbxml1/glossary/constant
diff --git a/bdbxml1/glossary/data b/ext/bdbxml1/glossary/data
similarity index 100%
rename from bdbxml1/glossary/data
rename to ext/bdbxml1/glossary/data
diff --git a/bdbxml1/glossary/defined? b/ext/bdbxml1/glossary/defined?
similarity index 100%
rename from bdbxml1/glossary/defined?
rename to ext/bdbxml1/glossary/defined?
diff --git a/bdbxml1/glossary/destructive b/ext/bdbxml1/glossary/destructive
similarity index 100%
rename from bdbxml1/glossary/destructive
rename to ext/bdbxml1/glossary/destructive
diff --git a/bdbxml1/glossary/dictionary b/ext/bdbxml1/glossary/dictionary
similarity index 100%
rename from bdbxml1/glossary/dictionary
rename to ext/bdbxml1/glossary/dictionary
diff --git a/bdbxml1/glossary/document b/ext/bdbxml1/glossary/document
similarity index 100%
rename from bdbxml1/glossary/document
rename to ext/bdbxml1/glossary/document
diff --git a/bdbxml1/glossary/dynamic_binding b/ext/bdbxml1/glossary/dynamic_binding
similarity index 100%
rename from bdbxml1/glossary/dynamic_binding
rename to ext/bdbxml1/glossary/dynamic_binding
diff --git a/bdbxml1/glossary/eiffel b/ext/bdbxml1/glossary/eiffel
similarity index 100%
rename from bdbxml1/glossary/eiffel
rename to ext/bdbxml1/glossary/eiffel
diff --git a/bdbxml1/glossary/encapsulation b/ext/bdbxml1/glossary/encapsulation
similarity index 100%
rename from bdbxml1/glossary/encapsulation
rename to ext/bdbxml1/glossary/encapsulation
diff --git a/bdbxml1/glossary/end b/ext/bdbxml1/glossary/end
similarity index 100%
rename from bdbxml1/glossary/end
rename to ext/bdbxml1/glossary/end
diff --git a/bdbxml1/glossary/env b/ext/bdbxml1/glossary/env
similarity index 100%
rename from bdbxml1/glossary/env
rename to ext/bdbxml1/glossary/env
diff --git a/bdbxml1/glossary/environment_variable b/ext/bdbxml1/glossary/environment_variable
similarity index 100%
rename from bdbxml1/glossary/environment_variable
rename to ext/bdbxml1/glossary/environment_variable
diff --git a/bdbxml1/glossary/exception b/ext/bdbxml1/glossary/exception
similarity index 100%
rename from bdbxml1/glossary/exception
rename to ext/bdbxml1/glossary/exception
diff --git a/bdbxml1/glossary/faq b/ext/bdbxml1/glossary/faq
similarity index 100%
rename from bdbxml1/glossary/faq
rename to ext/bdbxml1/glossary/faq
diff --git a/bdbxml1/glossary/function b/ext/bdbxml1/glossary/function
similarity index 100%
rename from bdbxml1/glossary/function
rename to ext/bdbxml1/glossary/function
diff --git a/bdbxml1/glossary/global_variable b/ext/bdbxml1/glossary/global_variable
similarity index 100%
rename from bdbxml1/glossary/global_variable
rename to ext/bdbxml1/glossary/global_variable
diff --git a/bdbxml1/glossary/goto b/ext/bdbxml1/glossary/goto
similarity index 100%
rename from bdbxml1/glossary/goto
rename to ext/bdbxml1/glossary/goto
diff --git a/bdbxml1/glossary/hash b/ext/bdbxml1/glossary/hash
similarity index 100%
rename from bdbxml1/glossary/hash
rename to ext/bdbxml1/glossary/hash
diff --git a/bdbxml1/glossary/immediate_value b/ext/bdbxml1/glossary/immediate_value
similarity index 100%
rename from bdbxml1/glossary/immediate_value
rename to ext/bdbxml1/glossary/immediate_value
diff --git a/bdbxml1/glossary/inheritance b/ext/bdbxml1/glossary/inheritance
similarity index 100%
rename from bdbxml1/glossary/inheritance
rename to ext/bdbxml1/glossary/inheritance
diff --git a/bdbxml1/glossary/initialize b/ext/bdbxml1/glossary/initialize
similarity index 100%
rename from bdbxml1/glossary/initialize
rename to ext/bdbxml1/glossary/initialize
diff --git a/bdbxml1/glossary/instance b/ext/bdbxml1/glossary/instance
similarity index 100%
rename from bdbxml1/glossary/instance
rename to ext/bdbxml1/glossary/instance
diff --git a/bdbxml1/glossary/instance_variable b/ext/bdbxml1/glossary/instance_variable
similarity index 100%
rename from bdbxml1/glossary/instance_variable
rename to ext/bdbxml1/glossary/instance_variable
diff --git a/bdbxml1/glossary/iterator b/ext/bdbxml1/glossary/iterator
similarity index 100%
rename from bdbxml1/glossary/iterator
rename to ext/bdbxml1/glossary/iterator
diff --git a/bdbxml1/glossary/japanese_(language) b/ext/bdbxml1/glossary/japanese_(language)
similarity index 100%
rename from bdbxml1/glossary/japanese_(language)
rename to ext/bdbxml1/glossary/japanese_(language)
diff --git a/bdbxml1/glossary/little_endian b/ext/bdbxml1/glossary/little_endian
similarity index 100%
rename from bdbxml1/glossary/little_endian
rename to ext/bdbxml1/glossary/little_endian
diff --git a/bdbxml1/glossary/local_variable b/ext/bdbxml1/glossary/local_variable
similarity index 100%
rename from bdbxml1/glossary/local_variable
rename to ext/bdbxml1/glossary/local_variable
diff --git a/bdbxml1/glossary/main b/ext/bdbxml1/glossary/main
similarity index 100%
rename from bdbxml1/glossary/main
rename to ext/bdbxml1/glossary/main
diff --git a/bdbxml1/glossary/matchingdata b/ext/bdbxml1/glossary/matchingdata
similarity index 100%
rename from bdbxml1/glossary/matchingdata
rename to ext/bdbxml1/glossary/matchingdata
diff --git a/bdbxml1/glossary/matz b/ext/bdbxml1/glossary/matz
similarity index 100%
rename from bdbxml1/glossary/matz
rename to ext/bdbxml1/glossary/matz
diff --git a/bdbxml1/glossary/method b/ext/bdbxml1/glossary/method
similarity index 100%
rename from bdbxml1/glossary/method
rename to ext/bdbxml1/glossary/method
diff --git a/bdbxml1/glossary/mix-in b/ext/bdbxml1/glossary/mix-in
similarity index 100%
rename from bdbxml1/glossary/mix-in
rename to ext/bdbxml1/glossary/mix-in
diff --git a/bdbxml1/glossary/module_function b/ext/bdbxml1/glossary/module_function
similarity index 100%
rename from bdbxml1/glossary/module_function
rename to ext/bdbxml1/glossary/module_function
diff --git a/bdbxml1/glossary/non-local_exit b/ext/bdbxml1/glossary/non-local_exit
similarity index 100%
rename from bdbxml1/glossary/non-local_exit
rename to ext/bdbxml1/glossary/non-local_exit
diff --git a/bdbxml1/glossary/object b/ext/bdbxml1/glossary/object
similarity index 100%
rename from bdbxml1/glossary/object
rename to ext/bdbxml1/glossary/object
diff --git a/bdbxml1/glossary/object-oriented b/ext/bdbxml1/glossary/object-oriented
similarity index 100%
rename from bdbxml1/glossary/object-oriented
rename to ext/bdbxml1/glossary/object-oriented
diff --git a/bdbxml1/glossary/object-oriented_analysis b/ext/bdbxml1/glossary/object-oriented_analysis
similarity index 100%
rename from bdbxml1/glossary/object-oriented_analysis
rename to ext/bdbxml1/glossary/object-oriented_analysis
diff --git a/bdbxml1/glossary/object-oriented_design b/ext/bdbxml1/glossary/object-oriented_design
similarity index 100%
rename from bdbxml1/glossary/object-oriented_design
rename to ext/bdbxml1/glossary/object-oriented_design
diff --git a/bdbxml1/glossary/object-oriented_programming b/ext/bdbxml1/glossary/object-oriented_programming
similarity index 100%
rename from bdbxml1/glossary/object-oriented_programming
rename to ext/bdbxml1/glossary/object-oriented_programming
diff --git a/bdbxml1/glossary/override b/ext/bdbxml1/glossary/override
similarity index 100%
rename from bdbxml1/glossary/override
rename to ext/bdbxml1/glossary/override
diff --git a/bdbxml1/glossary/paradigm b/ext/bdbxml1/glossary/paradigm
similarity index 100%
rename from bdbxml1/glossary/paradigm
rename to ext/bdbxml1/glossary/paradigm
diff --git a/bdbxml1/glossary/perl b/ext/bdbxml1/glossary/perl
similarity index 100%
rename from bdbxml1/glossary/perl
rename to ext/bdbxml1/glossary/perl
diff --git a/bdbxml1/glossary/polymorphism b/ext/bdbxml1/glossary/polymorphism
similarity index 100%
rename from bdbxml1/glossary/polymorphism
rename to ext/bdbxml1/glossary/polymorphism
diff --git a/bdbxml1/glossary/python b/ext/bdbxml1/glossary/python
similarity index 100%
rename from bdbxml1/glossary/python
rename to ext/bdbxml1/glossary/python
diff --git a/bdbxml1/glossary/receiver b/ext/bdbxml1/glossary/receiver
similarity index 100%
rename from bdbxml1/glossary/receiver
rename to ext/bdbxml1/glossary/receiver
diff --git a/bdbxml1/glossary/redefinition b/ext/bdbxml1/glossary/redefinition
similarity index 100%
rename from bdbxml1/glossary/redefinition
rename to ext/bdbxml1/glossary/redefinition
diff --git a/bdbxml1/glossary/reference b/ext/bdbxml1/glossary/reference
similarity index 100%
rename from bdbxml1/glossary/reference
rename to ext/bdbxml1/glossary/reference
diff --git a/bdbxml1/glossary/ruby b/ext/bdbxml1/glossary/ruby
similarity index 100%
rename from bdbxml1/glossary/ruby
rename to ext/bdbxml1/glossary/ruby
diff --git a/bdbxml1/glossary/sather b/ext/bdbxml1/glossary/sather
similarity index 100%
rename from bdbxml1/glossary/sather
rename to ext/bdbxml1/glossary/sather
diff --git a/bdbxml1/glossary/script b/ext/bdbxml1/glossary/script
similarity index 100%
rename from bdbxml1/glossary/script
rename to ext/bdbxml1/glossary/script
diff --git a/bdbxml1/glossary/scripting_language b/ext/bdbxml1/glossary/scripting_language
similarity index 100%
rename from bdbxml1/glossary/scripting_language
rename to ext/bdbxml1/glossary/scripting_language
diff --git a/bdbxml1/glossary/self b/ext/bdbxml1/glossary/self
similarity index 100%
rename from bdbxml1/glossary/self
rename to ext/bdbxml1/glossary/self
diff --git a/bdbxml1/glossary/singleton_class b/ext/bdbxml1/glossary/singleton_class
similarity index 100%
rename from bdbxml1/glossary/singleton_class
rename to ext/bdbxml1/glossary/singleton_class
diff --git a/bdbxml1/glossary/singleton_method b/ext/bdbxml1/glossary/singleton_method
similarity index 100%
rename from bdbxml1/glossary/singleton_method
rename to ext/bdbxml1/glossary/singleton_method
diff --git a/bdbxml1/glossary/smalltalk b/ext/bdbxml1/glossary/smalltalk
similarity index 100%
rename from bdbxml1/glossary/smalltalk
rename to ext/bdbxml1/glossary/smalltalk
diff --git a/bdbxml1/glossary/sort b/ext/bdbxml1/glossary/sort
similarity index 100%
rename from bdbxml1/glossary/sort
rename to ext/bdbxml1/glossary/sort
diff --git a/bdbxml1/glossary/super b/ext/bdbxml1/glossary/super
similarity index 100%
rename from bdbxml1/glossary/super
rename to ext/bdbxml1/glossary/super
diff --git a/bdbxml1/glossary/thread b/ext/bdbxml1/glossary/thread
similarity index 100%
rename from bdbxml1/glossary/thread
rename to ext/bdbxml1/glossary/thread
diff --git a/bdbxml1/glossary/undef b/ext/bdbxml1/glossary/undef
similarity index 100%
rename from bdbxml1/glossary/undef
rename to ext/bdbxml1/glossary/undef
diff --git a/bdbxml1/glossary/variable b/ext/bdbxml1/glossary/variable
similarity index 100%
rename from bdbxml1/glossary/variable
rename to ext/bdbxml1/glossary/variable
diff --git a/bdbxml1/myconfig b/ext/bdbxml1/myconfig
similarity index 100%
rename from bdbxml1/myconfig
rename to ext/bdbxml1/myconfig
diff --git a/bdbxml1/tests/data.e b/ext/bdbxml1/tests/data.e
similarity index 100%
rename from bdbxml1/tests/data.e
rename to ext/bdbxml1/tests/data.e
diff --git a/bdbxml1/tests/data.t b/ext/bdbxml1/tests/data.t
similarity index 100%
rename from bdbxml1/tests/data.t
rename to ext/bdbxml1/tests/data.t
diff --git a/bdbxml1/tests/runit_.rb b/ext/bdbxml1/tests/runit_.rb
similarity index 100%
rename from bdbxml1/tests/runit_.rb
rename to ext/bdbxml1/tests/runit_.rb
diff --git a/bdbxml1/tests/xml.rb b/ext/bdbxml1/tests/xml.rb
similarity index 100%
rename from bdbxml1/tests/xml.rb
rename to ext/bdbxml1/tests/xml.rb
diff --git a/bdbxml2/Changes b/ext/bdbxml2/Changes
similarity index 100%
rename from bdbxml2/Changes
rename to ext/bdbxml2/Changes
diff --git a/bdbxml2/README.en b/ext/bdbxml2/README.en
similarity index 100%
rename from bdbxml2/README.en
rename to ext/bdbxml2/README.en
diff --git a/bdbxml2/bdbxml.cc b/ext/bdbxml2/bdbxml.cc
similarity index 100%
rename from bdbxml2/bdbxml.cc
rename to ext/bdbxml2/bdbxml.cc
diff --git a/bdbxml2/bdbxml.h b/ext/bdbxml2/bdbxml.h
similarity index 100%
rename from bdbxml2/bdbxml.h
rename to ext/bdbxml2/bdbxml.h
diff --git a/bdbxml2/bdbxml.rd b/ext/bdbxml2/bdbxml.rd
similarity index 100%
rename from bdbxml2/bdbxml.rd
rename to ext/bdbxml2/bdbxml.rd
diff --git a/bdbxml2/docs/bdbxml.rb b/ext/bdbxml2/docs/bdbxml.rb
similarity index 100%
rename from bdbxml2/docs/bdbxml.rb
rename to ext/bdbxml2/docs/bdbxml.rb
diff --git a/bdbxml2/docs/container.rb b/ext/bdbxml2/docs/container.rb
similarity index 100%
rename from bdbxml2/docs/container.rb
rename to ext/bdbxml2/docs/container.rb
diff --git a/bdbxml2/docs/container.rd b/ext/bdbxml2/docs/container.rd
similarity index 100%
rename from bdbxml2/docs/container.rd
rename to ext/bdbxml2/docs/container.rd
diff --git a/bdbxml2/docs/context.rb b/ext/bdbxml2/docs/context.rb
similarity index 100%
rename from bdbxml2/docs/context.rb
rename to ext/bdbxml2/docs/context.rb
diff --git a/bdbxml2/docs/context.rd b/ext/bdbxml2/docs/context.rd
similarity index 100%
rename from bdbxml2/docs/context.rd
rename to ext/bdbxml2/docs/context.rd
diff --git a/bdbxml2/docs/document.rb b/ext/bdbxml2/docs/document.rb
similarity index 100%
rename from bdbxml2/docs/document.rb
rename to ext/bdbxml2/docs/document.rb
diff --git a/bdbxml2/docs/document.rd b/ext/bdbxml2/docs/document.rd
similarity index 100%
rename from bdbxml2/docs/document.rd
rename to ext/bdbxml2/docs/document.rd
diff --git a/bdbxml2/docs/event_reader.rb b/ext/bdbxml2/docs/event_reader.rb
similarity index 100%
rename from bdbxml2/docs/event_reader.rb
rename to ext/bdbxml2/docs/event_reader.rb
diff --git a/bdbxml2/docs/event_reader.rd b/ext/bdbxml2/docs/event_reader.rd
similarity index 100%
rename from bdbxml2/docs/event_reader.rd
rename to ext/bdbxml2/docs/event_reader.rd
diff --git a/bdbxml2/docs/event_writer.rb b/ext/bdbxml2/docs/event_writer.rb
similarity index 100%
rename from bdbxml2/docs/event_writer.rb
rename to ext/bdbxml2/docs/event_writer.rb
diff --git a/bdbxml2/docs/event_writer.rd b/ext/bdbxml2/docs/event_writer.rd
similarity index 100%
rename from bdbxml2/docs/event_writer.rd
rename to ext/bdbxml2/docs/event_writer.rd
diff --git a/bdbxml2/docs/index.rb b/ext/bdbxml2/docs/index.rb
similarity index 100%
rename from bdbxml2/docs/index.rb
rename to ext/bdbxml2/docs/index.rb
diff --git a/bdbxml2/docs/index.rd b/ext/bdbxml2/docs/index.rd
similarity index 100%
rename from bdbxml2/docs/index.rd
rename to ext/bdbxml2/docs/index.rd
diff --git a/bdbxml2/docs/indexlookup.rb b/ext/bdbxml2/docs/indexlookup.rb
similarity index 100%
rename from bdbxml2/docs/indexlookup.rb
rename to ext/bdbxml2/docs/indexlookup.rb
diff --git a/bdbxml2/docs/indexlookup.rd b/ext/bdbxml2/docs/indexlookup.rd
similarity index 100%
rename from bdbxml2/docs/indexlookup.rd
rename to ext/bdbxml2/docs/indexlookup.rd
diff --git a/bdbxml2/docs/manager.rb b/ext/bdbxml2/docs/manager.rb
similarity index 100%
rename from bdbxml2/docs/manager.rb
rename to ext/bdbxml2/docs/manager.rb
diff --git a/bdbxml2/docs/manager.rd b/ext/bdbxml2/docs/manager.rd
similarity index 100%
rename from bdbxml2/docs/manager.rd
rename to ext/bdbxml2/docs/manager.rd
diff --git a/bdbxml2/docs/modify.rb b/ext/bdbxml2/docs/modify.rb
similarity index 100%
rename from bdbxml2/docs/modify.rb
rename to ext/bdbxml2/docs/modify.rb
diff --git a/bdbxml2/docs/modify.rd b/ext/bdbxml2/docs/modify.rd
similarity index 100%
rename from bdbxml2/docs/modify.rd
rename to ext/bdbxml2/docs/modify.rd
diff --git a/bdbxml2/docs/results.rb b/ext/bdbxml2/docs/results.rb
similarity index 100%
rename from bdbxml2/docs/results.rb
rename to ext/bdbxml2/docs/results.rb
diff --git a/bdbxml2/docs/results.rd b/ext/bdbxml2/docs/results.rd
similarity index 100%
rename from bdbxml2/docs/results.rd
rename to ext/bdbxml2/docs/results.rd
diff --git a/bdbxml2/docs/value.rb b/ext/bdbxml2/docs/value.rb
similarity index 100%
rename from bdbxml2/docs/value.rb
rename to ext/bdbxml2/docs/value.rb
diff --git a/bdbxml2/docs/value.rd b/ext/bdbxml2/docs/value.rd
similarity index 100%
rename from bdbxml2/docs/value.rd
rename to ext/bdbxml2/docs/value.rd
diff --git a/bdbxml2/examples/create.rb b/ext/bdbxml2/examples/create.rb
similarity index 100%
rename from bdbxml2/examples/create.rb
rename to ext/bdbxml2/examples/create.rb
diff --git a/bdbxml2/examples/dbxml/README b/ext/bdbxml2/examples/dbxml/README
similarity index 100%
rename from bdbxml2/examples/dbxml/README
rename to ext/bdbxml2/examples/dbxml/README
diff --git a/bdbxml2/examples/dbxml/a.sh b/ext/bdbxml2/examples/dbxml/a.sh
similarity index 100%
rename from bdbxml2/examples/dbxml/a.sh
rename to ext/bdbxml2/examples/dbxml/a.sh
diff --git a/bdbxml2/examples/dbxml/add_index.rb b/ext/bdbxml2/examples/dbxml/add_index.rb
similarity index 100%
rename from bdbxml2/examples/dbxml/add_index.rb
rename to ext/bdbxml2/examples/dbxml/add_index.rb
diff --git a/bdbxml2/examples/dbxml/build_db.rb b/ext/bdbxml2/examples/dbxml/build_db.rb
similarity index 100%
rename from bdbxml2/examples/dbxml/build_db.rb
rename to ext/bdbxml2/examples/dbxml/build_db.rb
diff --git a/bdbxml2/examples/dbxml/context.rb b/ext/bdbxml2/examples/dbxml/context.rb
similarity index 100%
rename from bdbxml2/examples/dbxml/context.rb
rename to ext/bdbxml2/examples/dbxml/context.rb
diff --git a/bdbxml2/examples/dbxml/delete.rb b/ext/bdbxml2/examples/dbxml/delete.rb
similarity index 100%
rename from bdbxml2/examples/dbxml/delete.rb
rename to ext/bdbxml2/examples/dbxml/delete.rb
diff --git a/bdbxml2/examples/dbxml/delete_index.rb b/ext/bdbxml2/examples/dbxml/delete_index.rb
similarity index 100%
rename from bdbxml2/examples/dbxml/delete_index.rb
rename to ext/bdbxml2/examples/dbxml/delete_index.rb
diff --git a/bdbxml2/examples/dbxml/document.rb b/ext/bdbxml2/examples/dbxml/document.rb
similarity index 100%
rename from bdbxml2/examples/dbxml/document.rb
rename to ext/bdbxml2/examples/dbxml/document.rb
diff --git a/bdbxml2/examples/dbxml/load.rb b/ext/bdbxml2/examples/dbxml/load.rb
similarity index 100%
rename from bdbxml2/examples/dbxml/load.rb
rename to ext/bdbxml2/examples/dbxml/load.rb
diff --git a/bdbxml2/examples/dbxml/loadex.rb b/ext/bdbxml2/examples/dbxml/loadex.rb
similarity index 100%
rename from bdbxml2/examples/dbxml/loadex.rb
rename to ext/bdbxml2/examples/dbxml/loadex.rb
diff --git a/bdbxml2/examples/dbxml/metadata.rb b/ext/bdbxml2/examples/dbxml/metadata.rb
similarity index 100%
rename from bdbxml2/examples/dbxml/metadata.rb
rename to ext/bdbxml2/examples/dbxml/metadata.rb
diff --git a/bdbxml2/examples/dbxml/names.rb b/ext/bdbxml2/examples/dbxml/names.rb
similarity index 100%
rename from bdbxml2/examples/dbxml/names.rb
rename to ext/bdbxml2/examples/dbxml/names.rb
diff --git a/bdbxml2/examples/dbxml/query.rb b/ext/bdbxml2/examples/dbxml/query.rb
similarity index 100%
rename from bdbxml2/examples/dbxml/query.rb
rename to ext/bdbxml2/examples/dbxml/query.rb
diff --git a/bdbxml2/examples/dbxml/replace_index.rb b/ext/bdbxml2/examples/dbxml/replace_index.rb
similarity index 100%
rename from bdbxml2/examples/dbxml/replace_index.rb
rename to ext/bdbxml2/examples/dbxml/replace_index.rb
diff --git a/bdbxml2/examples/dbxml/retrieve_db.rb b/ext/bdbxml2/examples/dbxml/retrieve_db.rb
similarity index 100%
rename from bdbxml2/examples/dbxml/retrieve_db.rb
rename to ext/bdbxml2/examples/dbxml/retrieve_db.rb
diff --git a/bdbxml2/examples/dbxml/update.rb b/ext/bdbxml2/examples/dbxml/update.rb
similarity index 100%
rename from bdbxml2/examples/dbxml/update.rb
rename to ext/bdbxml2/examples/dbxml/update.rb
diff --git a/bdbxml2/examples/event_reader.rb b/ext/bdbxml2/examples/event_reader.rb
similarity index 100%
rename from bdbxml2/examples/event_reader.rb
rename to ext/bdbxml2/examples/event_reader.rb
diff --git a/bdbxml2/examples/event_writer.rb b/ext/bdbxml2/examples/event_writer.rb
similarity index 100%
rename from bdbxml2/examples/event_writer.rb
rename to ext/bdbxml2/examples/event_writer.rb
diff --git a/bdbxml2/examples/index.rb b/ext/bdbxml2/examples/index.rb
similarity index 100%
rename from bdbxml2/examples/index.rb
rename to ext/bdbxml2/examples/index.rb
diff --git a/bdbxml2/examples/indexlookup.rb b/ext/bdbxml2/examples/indexlookup.rb
similarity index 100%
rename from bdbxml2/examples/indexlookup.rb
rename to ext/bdbxml2/examples/indexlookup.rb
diff --git a/bdbxml2/examples/modify.rb b/ext/bdbxml2/examples/modify.rb
similarity index 100%
rename from bdbxml2/examples/modify.rb
rename to ext/bdbxml2/examples/modify.rb
diff --git a/bdbxml2/examples/transaction.rb b/ext/bdbxml2/examples/transaction.rb
similarity index 100%
rename from bdbxml2/examples/transaction.rb
rename to ext/bdbxml2/examples/transaction.rb
diff --git a/bdbxml2/extconf.rb b/ext/bdbxml2/extconf.rb
similarity index 100%
rename from bdbxml2/extconf.rb
rename to ext/bdbxml2/extconf.rb
diff --git a/bdbxml2/features.rb b/ext/bdbxml2/features.rb
similarity index 100%
rename from bdbxml2/features.rb
rename to ext/bdbxml2/features.rb
diff --git a/bdbxml2/glossary/README b/ext/bdbxml2/glossary/README
similarity index 100%
rename from bdbxml2/glossary/README
rename to ext/bdbxml2/glossary/README
diff --git a/bdbxml2/glossary/abstract_data_type b/ext/bdbxml2/glossary/abstract_data_type
similarity index 100%
rename from bdbxml2/glossary/abstract_data_type
rename to ext/bdbxml2/glossary/abstract_data_type
diff --git a/bdbxml2/glossary/associative_array b/ext/bdbxml2/glossary/associative_array
similarity index 100%
rename from bdbxml2/glossary/associative_array
rename to ext/bdbxml2/glossary/associative_array
diff --git a/bdbxml2/glossary/awk b/ext/bdbxml2/glossary/awk
similarity index 100%
rename from bdbxml2/glossary/awk
rename to ext/bdbxml2/glossary/awk
diff --git a/bdbxml2/glossary/big_endian b/ext/bdbxml2/glossary/big_endian
similarity index 100%
rename from bdbxml2/glossary/big_endian
rename to ext/bdbxml2/glossary/big_endian
diff --git a/bdbxml2/glossary/block b/ext/bdbxml2/glossary/block
similarity index 100%
rename from bdbxml2/glossary/block
rename to ext/bdbxml2/glossary/block
diff --git a/bdbxml2/glossary/bug b/ext/bdbxml2/glossary/bug
similarity index 100%
rename from bdbxml2/glossary/bug
rename to ext/bdbxml2/glossary/bug
diff --git a/bdbxml2/glossary/built-in_class b/ext/bdbxml2/glossary/built-in_class
similarity index 100%
rename from bdbxml2/glossary/built-in_class
rename to ext/bdbxml2/glossary/built-in_class
diff --git a/bdbxml2/glossary/byte_order b/ext/bdbxml2/glossary/byte_order
similarity index 100%
rename from bdbxml2/glossary/byte_order
rename to ext/bdbxml2/glossary/byte_order
diff --git a/bdbxml2/glossary/class b/ext/bdbxml2/glossary/class
similarity index 100%
rename from bdbxml2/glossary/class
rename to ext/bdbxml2/glossary/class
diff --git a/bdbxml2/glossary/class_method b/ext/bdbxml2/glossary/class_method
similarity index 100%
rename from bdbxml2/glossary/class_method
rename to ext/bdbxml2/glossary/class_method
diff --git a/bdbxml2/glossary/coerce b/ext/bdbxml2/glossary/coerce
similarity index 100%
rename from bdbxml2/glossary/coerce
rename to ext/bdbxml2/glossary/coerce
diff --git a/bdbxml2/glossary/constant b/ext/bdbxml2/glossary/constant
similarity index 100%
rename from bdbxml2/glossary/constant
rename to ext/bdbxml2/glossary/constant
diff --git a/bdbxml2/glossary/data b/ext/bdbxml2/glossary/data
similarity index 100%
rename from bdbxml2/glossary/data
rename to ext/bdbxml2/glossary/data
diff --git a/bdbxml2/glossary/defined? b/ext/bdbxml2/glossary/defined?
similarity index 100%
rename from bdbxml2/glossary/defined?
rename to ext/bdbxml2/glossary/defined?
diff --git a/bdbxml2/glossary/destructive b/ext/bdbxml2/glossary/destructive
similarity index 100%
rename from bdbxml2/glossary/destructive
rename to ext/bdbxml2/glossary/destructive
diff --git a/bdbxml2/glossary/dictionary b/ext/bdbxml2/glossary/dictionary
similarity index 100%
rename from bdbxml2/glossary/dictionary
rename to ext/bdbxml2/glossary/dictionary
diff --git a/bdbxml2/glossary/document b/ext/bdbxml2/glossary/document
similarity index 100%
rename from bdbxml2/glossary/document
rename to ext/bdbxml2/glossary/document
diff --git a/bdbxml2/glossary/dynamic_binding b/ext/bdbxml2/glossary/dynamic_binding
similarity index 100%
rename from bdbxml2/glossary/dynamic_binding
rename to ext/bdbxml2/glossary/dynamic_binding
diff --git a/bdbxml2/glossary/eiffel b/ext/bdbxml2/glossary/eiffel
similarity index 100%
rename from bdbxml2/glossary/eiffel
rename to ext/bdbxml2/glossary/eiffel
diff --git a/bdbxml2/glossary/encapsulation b/ext/bdbxml2/glossary/encapsulation
similarity index 100%
rename from bdbxml2/glossary/encapsulation
rename to ext/bdbxml2/glossary/encapsulation
diff --git a/bdbxml2/glossary/end b/ext/bdbxml2/glossary/end
similarity index 100%
rename from bdbxml2/glossary/end
rename to ext/bdbxml2/glossary/end
diff --git a/bdbxml2/glossary/env b/ext/bdbxml2/glossary/env
similarity index 100%
rename from bdbxml2/glossary/env
rename to ext/bdbxml2/glossary/env
diff --git a/bdbxml2/glossary/environment_variable b/ext/bdbxml2/glossary/environment_variable
similarity index 100%
rename from bdbxml2/glossary/environment_variable
rename to ext/bdbxml2/glossary/environment_variable
diff --git a/bdbxml2/glossary/exception b/ext/bdbxml2/glossary/exception
similarity index 100%
rename from bdbxml2/glossary/exception
rename to ext/bdbxml2/glossary/exception
diff --git a/bdbxml2/glossary/faq b/ext/bdbxml2/glossary/faq
similarity index 100%
rename from bdbxml2/glossary/faq
rename to ext/bdbxml2/glossary/faq
diff --git a/bdbxml2/glossary/function b/ext/bdbxml2/glossary/function
similarity index 100%
rename from bdbxml2/glossary/function
rename to ext/bdbxml2/glossary/function
diff --git a/bdbxml2/glossary/global_variable b/ext/bdbxml2/glossary/global_variable
similarity index 100%
rename from bdbxml2/glossary/global_variable
rename to ext/bdbxml2/glossary/global_variable
diff --git a/bdbxml2/glossary/goto b/ext/bdbxml2/glossary/goto
similarity index 100%
rename from bdbxml2/glossary/goto
rename to ext/bdbxml2/glossary/goto
diff --git a/bdbxml2/glossary/hash b/ext/bdbxml2/glossary/hash
similarity index 100%
rename from bdbxml2/glossary/hash
rename to ext/bdbxml2/glossary/hash
diff --git a/bdbxml2/glossary/immediate_value b/ext/bdbxml2/glossary/immediate_value
similarity index 100%
rename from bdbxml2/glossary/immediate_value
rename to ext/bdbxml2/glossary/immediate_value
diff --git a/bdbxml2/glossary/inheritance b/ext/bdbxml2/glossary/inheritance
similarity index 100%
rename from bdbxml2/glossary/inheritance
rename to ext/bdbxml2/glossary/inheritance
diff --git a/bdbxml2/glossary/initialize b/ext/bdbxml2/glossary/initialize
similarity index 100%
rename from bdbxml2/glossary/initialize
rename to ext/bdbxml2/glossary/initialize
diff --git a/bdbxml2/glossary/instance b/ext/bdbxml2/glossary/instance
similarity index 100%
rename from bdbxml2/glossary/instance
rename to ext/bdbxml2/glossary/instance
diff --git a/bdbxml2/glossary/instance_variable b/ext/bdbxml2/glossary/instance_variable
similarity index 100%
rename from bdbxml2/glossary/instance_variable
rename to ext/bdbxml2/glossary/instance_variable
diff --git a/bdbxml2/glossary/iterator b/ext/bdbxml2/glossary/iterator
similarity index 100%
rename from bdbxml2/glossary/iterator
rename to ext/bdbxml2/glossary/iterator
diff --git a/bdbxml2/glossary/japanese_(language) b/ext/bdbxml2/glossary/japanese_(language)
similarity index 100%
rename from bdbxml2/glossary/japanese_(language)
rename to ext/bdbxml2/glossary/japanese_(language)
diff --git a/bdbxml2/glossary/little_endian b/ext/bdbxml2/glossary/little_endian
similarity index 100%
rename from bdbxml2/glossary/little_endian
rename to ext/bdbxml2/glossary/little_endian
diff --git a/bdbxml2/glossary/local_variable b/ext/bdbxml2/glossary/local_variable
similarity index 100%
rename from bdbxml2/glossary/local_variable
rename to ext/bdbxml2/glossary/local_variable
diff --git a/bdbxml2/glossary/main b/ext/bdbxml2/glossary/main
similarity index 100%
rename from bdbxml2/glossary/main
rename to ext/bdbxml2/glossary/main
diff --git a/bdbxml2/glossary/matchingdata b/ext/bdbxml2/glossary/matchingdata
similarity index 100%
rename from bdbxml2/glossary/matchingdata
rename to ext/bdbxml2/glossary/matchingdata
diff --git a/bdbxml2/glossary/matz b/ext/bdbxml2/glossary/matz
similarity index 100%
rename from bdbxml2/glossary/matz
rename to ext/bdbxml2/glossary/matz
diff --git a/bdbxml2/glossary/method b/ext/bdbxml2/glossary/method
similarity index 100%
rename from bdbxml2/glossary/method
rename to ext/bdbxml2/glossary/method
diff --git a/bdbxml2/glossary/mix-in b/ext/bdbxml2/glossary/mix-in
similarity index 100%
rename from bdbxml2/glossary/mix-in
rename to ext/bdbxml2/glossary/mix-in
diff --git a/bdbxml2/glossary/module_function b/ext/bdbxml2/glossary/module_function
similarity index 100%
rename from bdbxml2/glossary/module_function
rename to ext/bdbxml2/glossary/module_function
diff --git a/bdbxml2/glossary/non-local_exit b/ext/bdbxml2/glossary/non-local_exit
similarity index 100%
rename from bdbxml2/glossary/non-local_exit
rename to ext/bdbxml2/glossary/non-local_exit
diff --git a/bdbxml2/glossary/object b/ext/bdbxml2/glossary/object
similarity index 100%
rename from bdbxml2/glossary/object
rename to ext/bdbxml2/glossary/object
diff --git a/bdbxml2/glossary/object-oriented b/ext/bdbxml2/glossary/object-oriented
similarity index 100%
rename from bdbxml2/glossary/object-oriented
rename to ext/bdbxml2/glossary/object-oriented
diff --git a/bdbxml2/glossary/object-oriented_analysis b/ext/bdbxml2/glossary/object-oriented_analysis
similarity index 100%
rename from bdbxml2/glossary/object-oriented_analysis
rename to ext/bdbxml2/glossary/object-oriented_analysis
diff --git a/bdbxml2/glossary/object-oriented_design b/ext/bdbxml2/glossary/object-oriented_design
similarity index 100%
rename from bdbxml2/glossary/object-oriented_design
rename to ext/bdbxml2/glossary/object-oriented_design
diff --git a/bdbxml2/glossary/object-oriented_programming b/ext/bdbxml2/glossary/object-oriented_programming
similarity index 100%
rename from bdbxml2/glossary/object-oriented_programming
rename to ext/bdbxml2/glossary/object-oriented_programming
diff --git a/bdbxml2/glossary/override b/ext/bdbxml2/glossary/override
similarity index 100%
rename from bdbxml2/glossary/override
rename to ext/bdbxml2/glossary/override
diff --git a/bdbxml2/glossary/paradigm b/ext/bdbxml2/glossary/paradigm
similarity index 100%
rename from bdbxml2/glossary/paradigm
rename to ext/bdbxml2/glossary/paradigm
diff --git a/bdbxml2/glossary/perl b/ext/bdbxml2/glossary/perl
similarity index 100%
rename from bdbxml2/glossary/perl
rename to ext/bdbxml2/glossary/perl
diff --git a/bdbxml2/glossary/polymorphism b/ext/bdbxml2/glossary/polymorphism
similarity index 100%
rename from bdbxml2/glossary/polymorphism
rename to ext/bdbxml2/glossary/polymorphism
diff --git a/bdbxml2/glossary/python b/ext/bdbxml2/glossary/python
similarity index 100%
rename from bdbxml2/glossary/python
rename to ext/bdbxml2/glossary/python
diff --git a/bdbxml2/glossary/receiver b/ext/bdbxml2/glossary/receiver
similarity index 100%
rename from bdbxml2/glossary/receiver
rename to ext/bdbxml2/glossary/receiver
diff --git a/bdbxml2/glossary/redefinition b/ext/bdbxml2/glossary/redefinition
similarity index 100%
rename from bdbxml2/glossary/redefinition
rename to ext/bdbxml2/glossary/redefinition
diff --git a/bdbxml2/glossary/reference b/ext/bdbxml2/glossary/reference
similarity index 100%
rename from bdbxml2/glossary/reference
rename to ext/bdbxml2/glossary/reference
diff --git a/bdbxml2/glossary/ruby b/ext/bdbxml2/glossary/ruby
similarity index 100%
rename from bdbxml2/glossary/ruby
rename to ext/bdbxml2/glossary/ruby
diff --git a/bdbxml2/glossary/sather b/ext/bdbxml2/glossary/sather
similarity index 100%
rename from bdbxml2/glossary/sather
rename to ext/bdbxml2/glossary/sather
diff --git a/bdbxml2/glossary/script b/ext/bdbxml2/glossary/script
similarity index 100%
rename from bdbxml2/glossary/script
rename to ext/bdbxml2/glossary/script
diff --git a/bdbxml2/glossary/scripting_language b/ext/bdbxml2/glossary/scripting_language
similarity index 100%
rename from bdbxml2/glossary/scripting_language
rename to ext/bdbxml2/glossary/scripting_language
diff --git a/bdbxml2/glossary/self b/ext/bdbxml2/glossary/self
similarity index 100%
rename from bdbxml2/glossary/self
rename to ext/bdbxml2/glossary/self
diff --git a/bdbxml2/glossary/singleton_class b/ext/bdbxml2/glossary/singleton_class
similarity index 100%
rename from bdbxml2/glossary/singleton_class
rename to ext/bdbxml2/glossary/singleton_class
diff --git a/bdbxml2/glossary/singleton_method b/ext/bdbxml2/glossary/singleton_method
similarity index 100%
rename from bdbxml2/glossary/singleton_method
rename to ext/bdbxml2/glossary/singleton_method
diff --git a/bdbxml2/glossary/smalltalk b/ext/bdbxml2/glossary/smalltalk
similarity index 100%
rename from bdbxml2/glossary/smalltalk
rename to ext/bdbxml2/glossary/smalltalk
diff --git a/bdbxml2/glossary/sort b/ext/bdbxml2/glossary/sort
similarity index 100%
rename from bdbxml2/glossary/sort
rename to ext/bdbxml2/glossary/sort
diff --git a/bdbxml2/glossary/super b/ext/bdbxml2/glossary/super
similarity index 100%
rename from bdbxml2/glossary/super
rename to ext/bdbxml2/glossary/super
diff --git a/bdbxml2/glossary/thread b/ext/bdbxml2/glossary/thread
similarity index 100%
rename from bdbxml2/glossary/thread
rename to ext/bdbxml2/glossary/thread
diff --git a/bdbxml2/glossary/undef b/ext/bdbxml2/glossary/undef
similarity index 100%
rename from bdbxml2/glossary/undef
rename to ext/bdbxml2/glossary/undef
diff --git a/bdbxml2/glossary/variable b/ext/bdbxml2/glossary/variable
similarity index 100%
rename from bdbxml2/glossary/variable
rename to ext/bdbxml2/glossary/variable
diff --git a/bdbxml2/myconfig b/ext/bdbxml2/myconfig
similarity index 100%
rename from bdbxml2/myconfig
rename to ext/bdbxml2/myconfig
diff --git a/bdbxml2/myconfig-2.2 b/ext/bdbxml2/myconfig-2.2
similarity index 100%
rename from bdbxml2/myconfig-2.2
rename to ext/bdbxml2/myconfig-2.2
diff --git a/bdbxml2/myconfig-2.3 b/ext/bdbxml2/myconfig-2.3
similarity index 100%
rename from bdbxml2/myconfig-2.3
rename to ext/bdbxml2/myconfig-2.3
diff --git a/bdbxml2/myconfig-2.4 b/ext/bdbxml2/myconfig-2.4
similarity index 100%
rename from bdbxml2/myconfig-2.4
rename to ext/bdbxml2/myconfig-2.4
diff --git a/bdbxml2/tests/data.e b/ext/bdbxml2/tests/data.e
similarity index 100%
rename from bdbxml2/tests/data.e
rename to ext/bdbxml2/tests/data.e
diff --git a/bdbxml2/tests/data.t b/ext/bdbxml2/tests/data.t
similarity index 100%
rename from bdbxml2/tests/data.t
rename to ext/bdbxml2/tests/data.t
diff --git a/bdbxml2/tests/runit_.rb b/ext/bdbxml2/tests/runit_.rb
similarity index 100%
rename from bdbxml2/tests/runit_.rb
rename to ext/bdbxml2/tests/runit_.rb
diff --git a/bdbxml2/tests/xml.rb b/ext/bdbxml2/tests/xml.rb
similarity index 100%
rename from bdbxml2/tests/xml.rb
rename to ext/bdbxml2/tests/xml.rb
diff --git a/extconf.rb b/extconf.rb
deleted file mode 100644
index 0893637..0000000
--- a/extconf.rb
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/ruby
-require 'mkmf'
-
-def rule(target, clean = nil)
-   wr = "#{target}:
-\t@for subdir in $(SUBDIRS); do \\
-\t\t(cd $${subdir} && $(MAKE) #{target}); \\
-\tdone;
-"
-   if clean != nil
-      wr << "\t@-rm tmp/* tests/tmp/* 2> /dev/null\n"
-      wr << "\t@rm Makefile\n" if clean
-   end
-   wr
-end
-
-subdirs = if $configure_args.has_key?("--make")
-             []
-          else
-             Dir["*"].select do |subdir|
-                /\Abdbxml/ !~ subdir && File.file?(subdir + "/extconf.rb")
-             end
-          end
-
-begin
-   make = open("Makefile", "w")
-   make.print <<-EOF
-SUBDIRS = #{subdirs.join(' ')}
-
-#{rule('all')}
-#{rule('static')}
-#{rule('clean', false)}
-#{rule('distclean', true)}
-#{rule('realclean', true)}
-#{rule('install')}
-#{rule('site-install')}
-#{rule('unknown')}
-%.html: %.rd
-\trd2 $< > ${<:%.rd=%.html}
-
-   EOF
-   make.print "HTML = bdb.html"
-   docs = Dir['docs/*.rd']
-   docs.each {|x| make.print " \\\n\t#{x.sub(/\.rd$/, '.html')}" }
-   make.print "\n\nRDOC = bdb.rd"
-   docs.each {|x| make.print " \\\n\t#{x}" }
-   make.puts
-   make.print <<-EOF
-
-rdoc: docs/doc/index.html
-
-docs/doc/index.html: $(RDOC)
-\t@-(cd docs; rdoc .)
-
-ri:
-\t@-(rdoc -r docs/*rb)
-
-ri-site:
-\t@-(rdoc -R docs/*rb)
-
-rd2: html
-
-html: $(HTML)
-
-test: $(DLLIB)
-   EOF
-   Dir.foreach('tests') do |x|
-      next if /^\./ =~ x || /(_\.rb|~)$/ =~ x
-      next if FileTest.directory?(x)
-      make.print "\t-#{CONFIG['RUBY_INSTALL_NAME']} tests/#{x}\n"
-   end
-ensure
-   make.close
-end
-
-subdirs.each do |subdir|
-   STDERR.puts("#{$0}: Entering directory `#{subdir}'")
-   Dir.chdir(subdir)
-   system("#{CONFIG['RUBY_INSTALL_NAME']} extconf.rb " + ARGV.join(" "))
-   Dir.chdir("..")
-   STDERR.puts("#{$0}: Leaving directory `#{subdir}'")
-end
-$makefile_created = true