diff --git a/CMakeLists.txt b/storage/xtradb/CMakeLists.txt
similarity index 100%
rename from CMakeLists.txt
rename to storage/xtradb/CMakeLists.txt
diff --git a/COPYING.Google b/storage/xtradb/COPYING.Google
similarity index 100%
rename from COPYING.Google
rename to storage/xtradb/COPYING.Google
diff --git a/COPYING.Percona b/storage/xtradb/COPYING.Percona
similarity index 100%
rename from COPYING.Percona
rename to storage/xtradb/COPYING.Percona
diff --git a/Doxyfile b/storage/xtradb/Doxyfile
similarity index 100%
rename from Doxyfile
rename to storage/xtradb/Doxyfile
diff --git a/api/api0api.cc b/storage/xtradb/api/api0api.cc
similarity index 100%
rename from api/api0api.cc
rename to storage/xtradb/api/api0api.cc
diff --git a/api/api0misc.cc b/storage/xtradb/api/api0misc.cc
similarity index 100%
rename from api/api0misc.cc
rename to storage/xtradb/api/api0misc.cc
diff --git a/btr/btr0btr.cc b/storage/xtradb/btr/btr0btr.cc
similarity index 100%
rename from btr/btr0btr.cc
rename to storage/xtradb/btr/btr0btr.cc
diff --git a/btr/btr0cur.cc b/storage/xtradb/btr/btr0cur.cc
similarity index 100%
rename from btr/btr0cur.cc
rename to storage/xtradb/btr/btr0cur.cc
diff --git a/btr/btr0pcur.cc b/storage/xtradb/btr/btr0pcur.cc
similarity index 100%
rename from btr/btr0pcur.cc
rename to storage/xtradb/btr/btr0pcur.cc
diff --git a/btr/btr0sea.cc b/storage/xtradb/btr/btr0sea.cc
similarity index 100%
rename from btr/btr0sea.cc
rename to storage/xtradb/btr/btr0sea.cc
diff --git a/buf/buf0buddy.cc b/storage/xtradb/buf/buf0buddy.cc
similarity index 100%
rename from buf/buf0buddy.cc
rename to storage/xtradb/buf/buf0buddy.cc
diff --git a/buf/buf0buf.cc b/storage/xtradb/buf/buf0buf.cc
similarity index 100%
rename from buf/buf0buf.cc
rename to storage/xtradb/buf/buf0buf.cc
diff --git a/buf/buf0checksum.cc b/storage/xtradb/buf/buf0checksum.cc
similarity index 100%
rename from buf/buf0checksum.cc
rename to storage/xtradb/buf/buf0checksum.cc
diff --git a/buf/buf0dblwr.cc b/storage/xtradb/buf/buf0dblwr.cc
similarity index 100%
rename from buf/buf0dblwr.cc
rename to storage/xtradb/buf/buf0dblwr.cc
diff --git a/buf/buf0dump.cc b/storage/xtradb/buf/buf0dump.cc
similarity index 100%
rename from buf/buf0dump.cc
rename to storage/xtradb/buf/buf0dump.cc
diff --git a/buf/buf0flu.cc b/storage/xtradb/buf/buf0flu.cc
similarity index 100%
rename from buf/buf0flu.cc
rename to storage/xtradb/buf/buf0flu.cc
diff --git a/buf/buf0lru.cc b/storage/xtradb/buf/buf0lru.cc
similarity index 100%
rename from buf/buf0lru.cc
rename to storage/xtradb/buf/buf0lru.cc
diff --git a/buf/buf0rea.cc b/storage/xtradb/buf/buf0rea.cc
similarity index 100%
rename from buf/buf0rea.cc
rename to storage/xtradb/buf/buf0rea.cc
diff --git a/compile-innodb b/storage/xtradb/compile-innodb
similarity index 100%
rename from compile-innodb
rename to storage/xtradb/compile-innodb
diff --git a/data/data0data.cc b/storage/xtradb/data/data0data.cc
similarity index 100%
rename from data/data0data.cc
rename to storage/xtradb/data/data0data.cc
diff --git a/data/data0type.cc b/storage/xtradb/data/data0type.cc
similarity index 100%
rename from data/data0type.cc
rename to storage/xtradb/data/data0type.cc
diff --git a/dict/dict0boot.cc b/storage/xtradb/dict/dict0boot.cc
similarity index 100%
rename from dict/dict0boot.cc
rename to storage/xtradb/dict/dict0boot.cc
diff --git a/dict/dict0crea.cc b/storage/xtradb/dict/dict0crea.cc
similarity index 100%
rename from dict/dict0crea.cc
rename to storage/xtradb/dict/dict0crea.cc
diff --git a/dict/dict0dict.cc b/storage/xtradb/dict/dict0dict.cc
similarity index 100%
rename from dict/dict0dict.cc
rename to storage/xtradb/dict/dict0dict.cc
diff --git a/dict/dict0load.cc b/storage/xtradb/dict/dict0load.cc
similarity index 100%
rename from dict/dict0load.cc
rename to storage/xtradb/dict/dict0load.cc
diff --git a/dict/dict0mem.cc b/storage/xtradb/dict/dict0mem.cc
similarity index 100%
rename from dict/dict0mem.cc
rename to storage/xtradb/dict/dict0mem.cc
diff --git a/dict/dict0stats.cc b/storage/xtradb/dict/dict0stats.cc
similarity index 100%
rename from dict/dict0stats.cc
rename to storage/xtradb/dict/dict0stats.cc
diff --git a/dict/dict0stats_bg.cc b/storage/xtradb/dict/dict0stats_bg.cc
similarity index 100%
rename from dict/dict0stats_bg.cc
rename to storage/xtradb/dict/dict0stats_bg.cc
diff --git a/dyn/dyn0dyn.cc b/storage/xtradb/dyn/dyn0dyn.cc
similarity index 100%
rename from dyn/dyn0dyn.cc
rename to storage/xtradb/dyn/dyn0dyn.cc
diff --git a/eval/eval0eval.cc b/storage/xtradb/eval/eval0eval.cc
similarity index 100%
rename from eval/eval0eval.cc
rename to storage/xtradb/eval/eval0eval.cc
diff --git a/eval/eval0proc.cc b/storage/xtradb/eval/eval0proc.cc
similarity index 100%
rename from eval/eval0proc.cc
rename to storage/xtradb/eval/eval0proc.cc
diff --git a/fil/fil0fil.cc b/storage/xtradb/fil/fil0fil.cc
similarity index 100%
rename from fil/fil0fil.cc
rename to storage/xtradb/fil/fil0fil.cc
diff --git a/fsp/fsp0fsp.cc b/storage/xtradb/fsp/fsp0fsp.cc
similarity index 100%
rename from fsp/fsp0fsp.cc
rename to storage/xtradb/fsp/fsp0fsp.cc
diff --git a/fts/Makefile.query b/storage/xtradb/fts/Makefile.query
similarity index 100%
rename from fts/Makefile.query
rename to storage/xtradb/fts/Makefile.query
diff --git a/fts/fts0ast.cc b/storage/xtradb/fts/fts0ast.cc
similarity index 100%
rename from fts/fts0ast.cc
rename to storage/xtradb/fts/fts0ast.cc
diff --git a/fts/fts0blex.cc b/storage/xtradb/fts/fts0blex.cc
similarity index 100%
rename from fts/fts0blex.cc
rename to storage/xtradb/fts/fts0blex.cc
diff --git a/fts/fts0blex.l b/storage/xtradb/fts/fts0blex.l
similarity index 100%
rename from fts/fts0blex.l
rename to storage/xtradb/fts/fts0blex.l
diff --git a/fts/fts0config.cc b/storage/xtradb/fts/fts0config.cc
similarity index 100%
rename from fts/fts0config.cc
rename to storage/xtradb/fts/fts0config.cc
diff --git a/fts/fts0fts.cc b/storage/xtradb/fts/fts0fts.cc
similarity index 100%
rename from fts/fts0fts.cc
rename to storage/xtradb/fts/fts0fts.cc
diff --git a/fts/fts0opt.cc b/storage/xtradb/fts/fts0opt.cc
similarity index 100%
rename from fts/fts0opt.cc
rename to storage/xtradb/fts/fts0opt.cc
diff --git a/fts/fts0pars.cc b/storage/xtradb/fts/fts0pars.cc
similarity index 100%
rename from fts/fts0pars.cc
rename to storage/xtradb/fts/fts0pars.cc
diff --git a/fts/fts0pars.y b/storage/xtradb/fts/fts0pars.y
similarity index 100%
rename from fts/fts0pars.y
rename to storage/xtradb/fts/fts0pars.y
diff --git a/fts/fts0que.cc b/storage/xtradb/fts/fts0que.cc
similarity index 100%
rename from fts/fts0que.cc
rename to storage/xtradb/fts/fts0que.cc
diff --git a/fts/fts0sql.cc b/storage/xtradb/fts/fts0sql.cc
similarity index 100%
rename from fts/fts0sql.cc
rename to storage/xtradb/fts/fts0sql.cc
diff --git a/fts/fts0tlex.cc b/storage/xtradb/fts/fts0tlex.cc
similarity index 100%
rename from fts/fts0tlex.cc
rename to storage/xtradb/fts/fts0tlex.cc
diff --git a/fts/fts0tlex.l b/storage/xtradb/fts/fts0tlex.l
similarity index 100%
rename from fts/fts0tlex.l
rename to storage/xtradb/fts/fts0tlex.l
diff --git a/fts/make_parser.sh b/storage/xtradb/fts/make_parser.sh
similarity index 100%
rename from fts/make_parser.sh
rename to storage/xtradb/fts/make_parser.sh
diff --git a/fut/fut0fut.cc b/storage/xtradb/fut/fut0fut.cc
similarity index 100%
rename from fut/fut0fut.cc
rename to storage/xtradb/fut/fut0fut.cc
diff --git a/fut/fut0lst.cc b/storage/xtradb/fut/fut0lst.cc
similarity index 100%
rename from fut/fut0lst.cc
rename to storage/xtradb/fut/fut0lst.cc
diff --git a/ha/ha0ha.cc b/storage/xtradb/ha/ha0ha.cc
similarity index 100%
rename from ha/ha0ha.cc
rename to storage/xtradb/ha/ha0ha.cc
diff --git a/ha/ha0storage.cc b/storage/xtradb/ha/ha0storage.cc
similarity index 100%
rename from ha/ha0storage.cc
rename to storage/xtradb/ha/ha0storage.cc
diff --git a/ha/hash0hash.cc b/storage/xtradb/ha/hash0hash.cc
similarity index 100%
rename from ha/hash0hash.cc
rename to storage/xtradb/ha/hash0hash.cc
diff --git a/ha_innodb.def b/storage/xtradb/ha_innodb.def
similarity index 100%
rename from ha_innodb.def
rename to storage/xtradb/ha_innodb.def
diff --git a/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc
similarity index 100%
rename from handler/ha_innodb.cc
rename to storage/xtradb/handler/ha_innodb.cc
diff --git a/handler/ha_innodb.h b/storage/xtradb/handler/ha_innodb.h
similarity index 100%
rename from handler/ha_innodb.h
rename to storage/xtradb/handler/ha_innodb.h
diff --git a/handler/handler0alter.cc b/storage/xtradb/handler/handler0alter.cc
similarity index 100%
rename from handler/handler0alter.cc
rename to storage/xtradb/handler/handler0alter.cc
diff --git a/handler/i_s.cc b/storage/xtradb/handler/i_s.cc
similarity index 100%
rename from handler/i_s.cc
rename to storage/xtradb/handler/i_s.cc
diff --git a/handler/i_s.h b/storage/xtradb/handler/i_s.h
similarity index 100%
rename from handler/i_s.h
rename to storage/xtradb/handler/i_s.h
diff --git a/handler/xtradb_i_s.cc b/storage/xtradb/handler/xtradb_i_s.cc
similarity index 100%
rename from handler/xtradb_i_s.cc
rename to storage/xtradb/handler/xtradb_i_s.cc
diff --git a/handler/xtradb_i_s.h b/storage/xtradb/handler/xtradb_i_s.h
similarity index 100%
rename from handler/xtradb_i_s.h
rename to storage/xtradb/handler/xtradb_i_s.h
diff --git a/ibuf/ibuf0ibuf.cc b/storage/xtradb/ibuf/ibuf0ibuf.cc
similarity index 100%
rename from ibuf/ibuf0ibuf.cc
rename to storage/xtradb/ibuf/ibuf0ibuf.cc
diff --git a/include/api0api.h b/storage/xtradb/include/api0api.h
similarity index 100%
rename from include/api0api.h
rename to storage/xtradb/include/api0api.h
diff --git a/include/api0misc.h b/storage/xtradb/include/api0misc.h
similarity index 100%
rename from include/api0misc.h
rename to storage/xtradb/include/api0misc.h
diff --git a/include/btr0btr.h b/storage/xtradb/include/btr0btr.h
similarity index 100%
rename from include/btr0btr.h
rename to storage/xtradb/include/btr0btr.h
diff --git a/include/btr0btr.ic b/storage/xtradb/include/btr0btr.ic
similarity index 100%
rename from include/btr0btr.ic
rename to storage/xtradb/include/btr0btr.ic
diff --git a/include/btr0cur.h b/storage/xtradb/include/btr0cur.h
similarity index 100%
rename from include/btr0cur.h
rename to storage/xtradb/include/btr0cur.h
diff --git a/include/btr0cur.ic b/storage/xtradb/include/btr0cur.ic
similarity index 100%
rename from include/btr0cur.ic
rename to storage/xtradb/include/btr0cur.ic
diff --git a/include/btr0pcur.h b/storage/xtradb/include/btr0pcur.h
similarity index 100%
rename from include/btr0pcur.h
rename to storage/xtradb/include/btr0pcur.h
diff --git a/include/btr0pcur.ic b/storage/xtradb/include/btr0pcur.ic
similarity index 100%
rename from include/btr0pcur.ic
rename to storage/xtradb/include/btr0pcur.ic
diff --git a/include/btr0sea.h b/storage/xtradb/include/btr0sea.h
similarity index 100%
rename from include/btr0sea.h
rename to storage/xtradb/include/btr0sea.h
diff --git a/include/btr0sea.ic b/storage/xtradb/include/btr0sea.ic
similarity index 100%
rename from include/btr0sea.ic
rename to storage/xtradb/include/btr0sea.ic
diff --git a/include/btr0types.h b/storage/xtradb/include/btr0types.h
similarity index 100%
rename from include/btr0types.h
rename to storage/xtradb/include/btr0types.h
diff --git a/include/buf0buddy.h b/storage/xtradb/include/buf0buddy.h
similarity index 100%
rename from include/buf0buddy.h
rename to storage/xtradb/include/buf0buddy.h
diff --git a/include/buf0buddy.ic b/storage/xtradb/include/buf0buddy.ic
similarity index 100%
rename from include/buf0buddy.ic
rename to storage/xtradb/include/buf0buddy.ic
diff --git a/include/buf0buf.h b/storage/xtradb/include/buf0buf.h
similarity index 100%
rename from include/buf0buf.h
rename to storage/xtradb/include/buf0buf.h
diff --git a/include/buf0buf.ic b/storage/xtradb/include/buf0buf.ic
similarity index 100%
rename from include/buf0buf.ic
rename to storage/xtradb/include/buf0buf.ic
diff --git a/include/buf0checksum.h b/storage/xtradb/include/buf0checksum.h
similarity index 100%
rename from include/buf0checksum.h
rename to storage/xtradb/include/buf0checksum.h
diff --git a/include/buf0dblwr.h b/storage/xtradb/include/buf0dblwr.h
similarity index 100%
rename from include/buf0dblwr.h
rename to storage/xtradb/include/buf0dblwr.h
diff --git a/include/buf0dump.h b/storage/xtradb/include/buf0dump.h
similarity index 100%
rename from include/buf0dump.h
rename to storage/xtradb/include/buf0dump.h
diff --git a/include/buf0flu.h b/storage/xtradb/include/buf0flu.h
similarity index 100%
rename from include/buf0flu.h
rename to storage/xtradb/include/buf0flu.h
diff --git a/include/buf0flu.ic b/storage/xtradb/include/buf0flu.ic
similarity index 100%
rename from include/buf0flu.ic
rename to storage/xtradb/include/buf0flu.ic
diff --git a/include/buf0lru.h b/storage/xtradb/include/buf0lru.h
similarity index 100%
rename from include/buf0lru.h
rename to storage/xtradb/include/buf0lru.h
diff --git a/include/buf0lru.ic b/storage/xtradb/include/buf0lru.ic
similarity index 100%
rename from include/buf0lru.ic
rename to storage/xtradb/include/buf0lru.ic
diff --git a/include/buf0rea.h b/storage/xtradb/include/buf0rea.h
similarity index 100%
rename from include/buf0rea.h
rename to storage/xtradb/include/buf0rea.h
diff --git a/include/buf0types.h b/storage/xtradb/include/buf0types.h
similarity index 100%
rename from include/buf0types.h
rename to storage/xtradb/include/buf0types.h
diff --git a/include/data0data.h b/storage/xtradb/include/data0data.h
similarity index 100%
rename from include/data0data.h
rename to storage/xtradb/include/data0data.h
diff --git a/include/data0data.ic b/storage/xtradb/include/data0data.ic
similarity index 100%
rename from include/data0data.ic
rename to storage/xtradb/include/data0data.ic
diff --git a/include/data0type.h b/storage/xtradb/include/data0type.h
similarity index 100%
rename from include/data0type.h
rename to storage/xtradb/include/data0type.h
diff --git a/include/data0type.ic b/storage/xtradb/include/data0type.ic
similarity index 100%
rename from include/data0type.ic
rename to storage/xtradb/include/data0type.ic
diff --git a/include/data0types.h b/storage/xtradb/include/data0types.h
similarity index 100%
rename from include/data0types.h
rename to storage/xtradb/include/data0types.h
diff --git a/include/db0err.h b/storage/xtradb/include/db0err.h
similarity index 100%
rename from include/db0err.h
rename to storage/xtradb/include/db0err.h
diff --git a/include/dict0boot.h b/storage/xtradb/include/dict0boot.h
similarity index 100%
rename from include/dict0boot.h
rename to storage/xtradb/include/dict0boot.h
diff --git a/include/dict0boot.ic b/storage/xtradb/include/dict0boot.ic
similarity index 100%
rename from include/dict0boot.ic
rename to storage/xtradb/include/dict0boot.ic
diff --git a/include/dict0crea.h b/storage/xtradb/include/dict0crea.h
similarity index 100%
rename from include/dict0crea.h
rename to storage/xtradb/include/dict0crea.h
diff --git a/include/dict0crea.ic b/storage/xtradb/include/dict0crea.ic
similarity index 100%
rename from include/dict0crea.ic
rename to storage/xtradb/include/dict0crea.ic
diff --git a/include/dict0dict.h b/storage/xtradb/include/dict0dict.h
similarity index 100%
rename from include/dict0dict.h
rename to storage/xtradb/include/dict0dict.h
diff --git a/include/dict0dict.ic b/storage/xtradb/include/dict0dict.ic
similarity index 100%
rename from include/dict0dict.ic
rename to storage/xtradb/include/dict0dict.ic
diff --git a/include/dict0load.h b/storage/xtradb/include/dict0load.h
similarity index 100%
rename from include/dict0load.h
rename to storage/xtradb/include/dict0load.h
diff --git a/include/dict0load.ic b/storage/xtradb/include/dict0load.ic
similarity index 100%
rename from include/dict0load.ic
rename to storage/xtradb/include/dict0load.ic
diff --git a/include/dict0mem.h b/storage/xtradb/include/dict0mem.h
similarity index 100%
rename from include/dict0mem.h
rename to storage/xtradb/include/dict0mem.h
diff --git a/include/dict0mem.ic b/storage/xtradb/include/dict0mem.ic
similarity index 100%
rename from include/dict0mem.ic
rename to storage/xtradb/include/dict0mem.ic
diff --git a/include/dict0priv.h b/storage/xtradb/include/dict0priv.h
similarity index 100%
rename from include/dict0priv.h
rename to storage/xtradb/include/dict0priv.h
diff --git a/include/dict0priv.ic b/storage/xtradb/include/dict0priv.ic
similarity index 100%
rename from include/dict0priv.ic
rename to storage/xtradb/include/dict0priv.ic
diff --git a/include/dict0stats.h b/storage/xtradb/include/dict0stats.h
similarity index 100%
rename from include/dict0stats.h
rename to storage/xtradb/include/dict0stats.h
diff --git a/include/dict0stats.ic b/storage/xtradb/include/dict0stats.ic
similarity index 100%
rename from include/dict0stats.ic
rename to storage/xtradb/include/dict0stats.ic
diff --git a/include/dict0stats_bg.h b/storage/xtradb/include/dict0stats_bg.h
similarity index 100%
rename from include/dict0stats_bg.h
rename to storage/xtradb/include/dict0stats_bg.h
diff --git a/include/dict0stats_bg.ic b/storage/xtradb/include/dict0stats_bg.ic
similarity index 100%
rename from include/dict0stats_bg.ic
rename to storage/xtradb/include/dict0stats_bg.ic
diff --git a/include/dict0types.h b/storage/xtradb/include/dict0types.h
similarity index 100%
rename from include/dict0types.h
rename to storage/xtradb/include/dict0types.h
diff --git a/include/dyn0dyn.h b/storage/xtradb/include/dyn0dyn.h
similarity index 100%
rename from include/dyn0dyn.h
rename to storage/xtradb/include/dyn0dyn.h
diff --git a/include/dyn0dyn.ic b/storage/xtradb/include/dyn0dyn.ic
similarity index 100%
rename from include/dyn0dyn.ic
rename to storage/xtradb/include/dyn0dyn.ic
diff --git a/include/eval0eval.h b/storage/xtradb/include/eval0eval.h
similarity index 100%
rename from include/eval0eval.h
rename to storage/xtradb/include/eval0eval.h
diff --git a/include/eval0eval.ic b/storage/xtradb/include/eval0eval.ic
similarity index 100%
rename from include/eval0eval.ic
rename to storage/xtradb/include/eval0eval.ic
diff --git a/include/eval0proc.h b/storage/xtradb/include/eval0proc.h
similarity index 100%
rename from include/eval0proc.h
rename to storage/xtradb/include/eval0proc.h
diff --git a/include/eval0proc.ic b/storage/xtradb/include/eval0proc.ic
similarity index 100%
rename from include/eval0proc.ic
rename to storage/xtradb/include/eval0proc.ic
diff --git a/include/fil0fil.h b/storage/xtradb/include/fil0fil.h
similarity index 100%
rename from include/fil0fil.h
rename to storage/xtradb/include/fil0fil.h
diff --git a/include/fsp0fsp.h b/storage/xtradb/include/fsp0fsp.h
similarity index 100%
rename from include/fsp0fsp.h
rename to storage/xtradb/include/fsp0fsp.h
diff --git a/include/fsp0fsp.ic b/storage/xtradb/include/fsp0fsp.ic
similarity index 100%
rename from include/fsp0fsp.ic
rename to storage/xtradb/include/fsp0fsp.ic
diff --git a/include/fsp0types.h b/storage/xtradb/include/fsp0types.h
similarity index 100%
rename from include/fsp0types.h
rename to storage/xtradb/include/fsp0types.h
diff --git a/include/fts0ast.h b/storage/xtradb/include/fts0ast.h
similarity index 100%
rename from include/fts0ast.h
rename to storage/xtradb/include/fts0ast.h
diff --git a/include/fts0blex.h b/storage/xtradb/include/fts0blex.h
similarity index 100%
rename from include/fts0blex.h
rename to storage/xtradb/include/fts0blex.h
diff --git a/include/fts0fts.h b/storage/xtradb/include/fts0fts.h
similarity index 100%
rename from include/fts0fts.h
rename to storage/xtradb/include/fts0fts.h
diff --git a/include/fts0opt.h b/storage/xtradb/include/fts0opt.h
similarity index 100%
rename from include/fts0opt.h
rename to storage/xtradb/include/fts0opt.h
diff --git a/include/fts0pars.h b/storage/xtradb/include/fts0pars.h
similarity index 100%
rename from include/fts0pars.h
rename to storage/xtradb/include/fts0pars.h
diff --git a/include/fts0priv.h b/storage/xtradb/include/fts0priv.h
similarity index 100%
rename from include/fts0priv.h
rename to storage/xtradb/include/fts0priv.h
diff --git a/include/fts0priv.ic b/storage/xtradb/include/fts0priv.ic
similarity index 100%
rename from include/fts0priv.ic
rename to storage/xtradb/include/fts0priv.ic
diff --git a/include/fts0tlex.h b/storage/xtradb/include/fts0tlex.h
similarity index 100%
rename from include/fts0tlex.h
rename to storage/xtradb/include/fts0tlex.h
diff --git a/include/fts0types.h b/storage/xtradb/include/fts0types.h
similarity index 100%
rename from include/fts0types.h
rename to storage/xtradb/include/fts0types.h
diff --git a/include/fts0types.ic b/storage/xtradb/include/fts0types.ic
similarity index 100%
rename from include/fts0types.ic
rename to storage/xtradb/include/fts0types.ic
diff --git a/include/fts0vlc.ic b/storage/xtradb/include/fts0vlc.ic
similarity index 100%
rename from include/fts0vlc.ic
rename to storage/xtradb/include/fts0vlc.ic
diff --git a/include/fut0fut.h b/storage/xtradb/include/fut0fut.h
similarity index 100%
rename from include/fut0fut.h
rename to storage/xtradb/include/fut0fut.h
diff --git a/include/fut0fut.ic b/storage/xtradb/include/fut0fut.ic
similarity index 100%
rename from include/fut0fut.ic
rename to storage/xtradb/include/fut0fut.ic
diff --git a/include/fut0lst.h b/storage/xtradb/include/fut0lst.h
similarity index 100%
rename from include/fut0lst.h
rename to storage/xtradb/include/fut0lst.h
diff --git a/include/fut0lst.ic b/storage/xtradb/include/fut0lst.ic
similarity index 100%
rename from include/fut0lst.ic
rename to storage/xtradb/include/fut0lst.ic
diff --git a/include/ha0ha.h b/storage/xtradb/include/ha0ha.h
similarity index 100%
rename from include/ha0ha.h
rename to storage/xtradb/include/ha0ha.h
diff --git a/include/ha0ha.ic b/storage/xtradb/include/ha0ha.ic
similarity index 100%
rename from include/ha0ha.ic
rename to storage/xtradb/include/ha0ha.ic
diff --git a/include/ha0storage.h b/storage/xtradb/include/ha0storage.h
similarity index 100%
rename from include/ha0storage.h
rename to storage/xtradb/include/ha0storage.h
diff --git a/include/ha0storage.ic b/storage/xtradb/include/ha0storage.ic
similarity index 100%
rename from include/ha0storage.ic
rename to storage/xtradb/include/ha0storage.ic
diff --git a/include/ha_prototypes.h b/storage/xtradb/include/ha_prototypes.h
similarity index 100%
rename from include/ha_prototypes.h
rename to storage/xtradb/include/ha_prototypes.h
diff --git a/include/handler0alter.h b/storage/xtradb/include/handler0alter.h
similarity index 100%
rename from include/handler0alter.h
rename to storage/xtradb/include/handler0alter.h
diff --git a/include/hash0hash.h b/storage/xtradb/include/hash0hash.h
similarity index 100%
rename from include/hash0hash.h
rename to storage/xtradb/include/hash0hash.h
diff --git a/include/hash0hash.ic b/storage/xtradb/include/hash0hash.ic
similarity index 100%
rename from include/hash0hash.ic
rename to storage/xtradb/include/hash0hash.ic
diff --git a/include/ibuf0ibuf.h b/storage/xtradb/include/ibuf0ibuf.h
similarity index 100%
rename from include/ibuf0ibuf.h
rename to storage/xtradb/include/ibuf0ibuf.h
diff --git a/include/ibuf0ibuf.ic b/storage/xtradb/include/ibuf0ibuf.ic
similarity index 100%
rename from include/ibuf0ibuf.ic
rename to storage/xtradb/include/ibuf0ibuf.ic
diff --git a/include/ibuf0types.h b/storage/xtradb/include/ibuf0types.h
similarity index 100%
rename from include/ibuf0types.h
rename to storage/xtradb/include/ibuf0types.h
diff --git a/include/lock0iter.h b/storage/xtradb/include/lock0iter.h
similarity index 100%
rename from include/lock0iter.h
rename to storage/xtradb/include/lock0iter.h
diff --git a/include/lock0lock.h b/storage/xtradb/include/lock0lock.h
similarity index 100%
rename from include/lock0lock.h
rename to storage/xtradb/include/lock0lock.h
diff --git a/include/lock0lock.ic b/storage/xtradb/include/lock0lock.ic
similarity index 100%
rename from include/lock0lock.ic
rename to storage/xtradb/include/lock0lock.ic
diff --git a/include/lock0priv.h b/storage/xtradb/include/lock0priv.h
similarity index 100%
rename from include/lock0priv.h
rename to storage/xtradb/include/lock0priv.h
diff --git a/include/lock0priv.ic b/storage/xtradb/include/lock0priv.ic
similarity index 100%
rename from include/lock0priv.ic
rename to storage/xtradb/include/lock0priv.ic
diff --git a/include/lock0types.h b/storage/xtradb/include/lock0types.h
similarity index 100%
rename from include/lock0types.h
rename to storage/xtradb/include/lock0types.h
diff --git a/include/log0log.h b/storage/xtradb/include/log0log.h
similarity index 100%
rename from include/log0log.h
rename to storage/xtradb/include/log0log.h
diff --git a/include/log0log.ic b/storage/xtradb/include/log0log.ic
similarity index 100%
rename from include/log0log.ic
rename to storage/xtradb/include/log0log.ic
diff --git a/include/log0online.h b/storage/xtradb/include/log0online.h
similarity index 100%
rename from include/log0online.h
rename to storage/xtradb/include/log0online.h
diff --git a/include/log0recv.h b/storage/xtradb/include/log0recv.h
similarity index 100%
rename from include/log0recv.h
rename to storage/xtradb/include/log0recv.h
diff --git a/include/log0recv.ic b/storage/xtradb/include/log0recv.ic
similarity index 100%
rename from include/log0recv.ic
rename to storage/xtradb/include/log0recv.ic
diff --git a/include/mach0data.h b/storage/xtradb/include/mach0data.h
similarity index 100%
rename from include/mach0data.h
rename to storage/xtradb/include/mach0data.h
diff --git a/include/mach0data.ic b/storage/xtradb/include/mach0data.ic
similarity index 100%
rename from include/mach0data.ic
rename to storage/xtradb/include/mach0data.ic
diff --git a/include/mem0dbg.h b/storage/xtradb/include/mem0dbg.h
similarity index 100%
rename from include/mem0dbg.h
rename to storage/xtradb/include/mem0dbg.h
diff --git a/include/mem0dbg.ic b/storage/xtradb/include/mem0dbg.ic
similarity index 100%
rename from include/mem0dbg.ic
rename to storage/xtradb/include/mem0dbg.ic
diff --git a/include/mem0mem.h b/storage/xtradb/include/mem0mem.h
similarity index 100%
rename from include/mem0mem.h
rename to storage/xtradb/include/mem0mem.h
diff --git a/include/mem0mem.ic b/storage/xtradb/include/mem0mem.ic
similarity index 100%
rename from include/mem0mem.ic
rename to storage/xtradb/include/mem0mem.ic
diff --git a/include/mem0pool.h b/storage/xtradb/include/mem0pool.h
similarity index 100%
rename from include/mem0pool.h
rename to storage/xtradb/include/mem0pool.h
diff --git a/include/mem0pool.ic b/storage/xtradb/include/mem0pool.ic
similarity index 100%
rename from include/mem0pool.ic
rename to storage/xtradb/include/mem0pool.ic
diff --git a/include/mtr0log.h b/storage/xtradb/include/mtr0log.h
similarity index 100%
rename from include/mtr0log.h
rename to storage/xtradb/include/mtr0log.h
diff --git a/include/mtr0log.ic b/storage/xtradb/include/mtr0log.ic
similarity index 100%
rename from include/mtr0log.ic
rename to storage/xtradb/include/mtr0log.ic
diff --git a/include/mtr0mtr.h b/storage/xtradb/include/mtr0mtr.h
similarity index 100%
rename from include/mtr0mtr.h
rename to storage/xtradb/include/mtr0mtr.h
diff --git a/include/mtr0mtr.ic b/storage/xtradb/include/mtr0mtr.ic
similarity index 100%
rename from include/mtr0mtr.ic
rename to storage/xtradb/include/mtr0mtr.ic
diff --git a/include/mtr0types.h b/storage/xtradb/include/mtr0types.h
similarity index 100%
rename from include/mtr0types.h
rename to storage/xtradb/include/mtr0types.h
diff --git a/include/os0file.h b/storage/xtradb/include/os0file.h
similarity index 100%
rename from include/os0file.h
rename to storage/xtradb/include/os0file.h
diff --git a/include/os0file.ic b/storage/xtradb/include/os0file.ic
similarity index 100%
rename from include/os0file.ic
rename to storage/xtradb/include/os0file.ic
diff --git a/include/os0once.h b/storage/xtradb/include/os0once.h
similarity index 100%
rename from include/os0once.h
rename to storage/xtradb/include/os0once.h
diff --git a/include/os0proc.h b/storage/xtradb/include/os0proc.h
similarity index 100%
rename from include/os0proc.h
rename to storage/xtradb/include/os0proc.h
diff --git a/include/os0proc.ic b/storage/xtradb/include/os0proc.ic
similarity index 100%
rename from include/os0proc.ic
rename to storage/xtradb/include/os0proc.ic
diff --git a/include/os0sync.h b/storage/xtradb/include/os0sync.h
similarity index 100%
rename from include/os0sync.h
rename to storage/xtradb/include/os0sync.h
diff --git a/include/os0sync.ic b/storage/xtradb/include/os0sync.ic
similarity index 100%
rename from include/os0sync.ic
rename to storage/xtradb/include/os0sync.ic
diff --git a/include/os0thread.h b/storage/xtradb/include/os0thread.h
similarity index 100%
rename from include/os0thread.h
rename to storage/xtradb/include/os0thread.h
diff --git a/include/os0thread.ic b/storage/xtradb/include/os0thread.ic
similarity index 100%
rename from include/os0thread.ic
rename to storage/xtradb/include/os0thread.ic
diff --git a/include/page0cur.h b/storage/xtradb/include/page0cur.h
similarity index 100%
rename from include/page0cur.h
rename to storage/xtradb/include/page0cur.h
diff --git a/include/page0cur.ic b/storage/xtradb/include/page0cur.ic
similarity index 100%
rename from include/page0cur.ic
rename to storage/xtradb/include/page0cur.ic
diff --git a/include/page0page.h b/storage/xtradb/include/page0page.h
similarity index 100%
rename from include/page0page.h
rename to storage/xtradb/include/page0page.h
diff --git a/include/page0page.ic b/storage/xtradb/include/page0page.ic
similarity index 100%
rename from include/page0page.ic
rename to storage/xtradb/include/page0page.ic
diff --git a/include/page0types.h b/storage/xtradb/include/page0types.h
similarity index 100%
rename from include/page0types.h
rename to storage/xtradb/include/page0types.h
diff --git a/include/page0zip.h b/storage/xtradb/include/page0zip.h
similarity index 100%
rename from include/page0zip.h
rename to storage/xtradb/include/page0zip.h
diff --git a/include/page0zip.ic b/storage/xtradb/include/page0zip.ic
similarity index 100%
rename from include/page0zip.ic
rename to storage/xtradb/include/page0zip.ic
diff --git a/include/pars0grm.h b/storage/xtradb/include/pars0grm.h
similarity index 100%
rename from include/pars0grm.h
rename to storage/xtradb/include/pars0grm.h
diff --git a/include/pars0opt.h b/storage/xtradb/include/pars0opt.h
similarity index 100%
rename from include/pars0opt.h
rename to storage/xtradb/include/pars0opt.h
diff --git a/include/pars0opt.ic b/storage/xtradb/include/pars0opt.ic
similarity index 100%
rename from include/pars0opt.ic
rename to storage/xtradb/include/pars0opt.ic
diff --git a/include/pars0pars.h b/storage/xtradb/include/pars0pars.h
similarity index 100%
rename from include/pars0pars.h
rename to storage/xtradb/include/pars0pars.h
diff --git a/include/pars0pars.ic b/storage/xtradb/include/pars0pars.ic
similarity index 100%
rename from include/pars0pars.ic
rename to storage/xtradb/include/pars0pars.ic
diff --git a/include/pars0sym.h b/storage/xtradb/include/pars0sym.h
similarity index 100%
rename from include/pars0sym.h
rename to storage/xtradb/include/pars0sym.h
diff --git a/include/pars0sym.ic b/storage/xtradb/include/pars0sym.ic
similarity index 100%
rename from include/pars0sym.ic
rename to storage/xtradb/include/pars0sym.ic
diff --git a/include/pars0types.h b/storage/xtradb/include/pars0types.h
similarity index 100%
rename from include/pars0types.h
rename to storage/xtradb/include/pars0types.h
diff --git a/include/que0que.h b/storage/xtradb/include/que0que.h
similarity index 100%
rename from include/que0que.h
rename to storage/xtradb/include/que0que.h
diff --git a/include/que0que.ic b/storage/xtradb/include/que0que.ic
similarity index 100%
rename from include/que0que.ic
rename to storage/xtradb/include/que0que.ic
diff --git a/include/que0types.h b/storage/xtradb/include/que0types.h
similarity index 100%
rename from include/que0types.h
rename to storage/xtradb/include/que0types.h
diff --git a/include/read0i_s.h b/storage/xtradb/include/read0i_s.h
similarity index 100%
rename from include/read0i_s.h
rename to storage/xtradb/include/read0i_s.h
diff --git a/include/read0read.h b/storage/xtradb/include/read0read.h
similarity index 100%
rename from include/read0read.h
rename to storage/xtradb/include/read0read.h
diff --git a/include/read0read.ic b/storage/xtradb/include/read0read.ic
similarity index 100%
rename from include/read0read.ic
rename to storage/xtradb/include/read0read.ic
diff --git a/include/read0types.h b/storage/xtradb/include/read0types.h
similarity index 100%
rename from include/read0types.h
rename to storage/xtradb/include/read0types.h
diff --git a/include/rem0cmp.h b/storage/xtradb/include/rem0cmp.h
similarity index 100%
rename from include/rem0cmp.h
rename to storage/xtradb/include/rem0cmp.h
diff --git a/include/rem0cmp.ic b/storage/xtradb/include/rem0cmp.ic
similarity index 100%
rename from include/rem0cmp.ic
rename to storage/xtradb/include/rem0cmp.ic
diff --git a/include/rem0rec.h b/storage/xtradb/include/rem0rec.h
similarity index 100%
rename from include/rem0rec.h
rename to storage/xtradb/include/rem0rec.h
diff --git a/include/rem0rec.ic b/storage/xtradb/include/rem0rec.ic
similarity index 100%
rename from include/rem0rec.ic
rename to storage/xtradb/include/rem0rec.ic
diff --git a/include/rem0types.h b/storage/xtradb/include/rem0types.h
similarity index 100%
rename from include/rem0types.h
rename to storage/xtradb/include/rem0types.h
diff --git a/include/row0ext.h b/storage/xtradb/include/row0ext.h
similarity index 100%
rename from include/row0ext.h
rename to storage/xtradb/include/row0ext.h
diff --git a/include/row0ext.ic b/storage/xtradb/include/row0ext.ic
similarity index 100%
rename from include/row0ext.ic
rename to storage/xtradb/include/row0ext.ic
diff --git a/include/row0ftsort.h b/storage/xtradb/include/row0ftsort.h
similarity index 100%
rename from include/row0ftsort.h
rename to storage/xtradb/include/row0ftsort.h
diff --git a/include/row0import.h b/storage/xtradb/include/row0import.h
similarity index 100%
rename from include/row0import.h
rename to storage/xtradb/include/row0import.h
diff --git a/include/row0import.ic b/storage/xtradb/include/row0import.ic
similarity index 100%
rename from include/row0import.ic
rename to storage/xtradb/include/row0import.ic
diff --git a/include/row0ins.h b/storage/xtradb/include/row0ins.h
similarity index 100%
rename from include/row0ins.h
rename to storage/xtradb/include/row0ins.h
diff --git a/include/row0ins.ic b/storage/xtradb/include/row0ins.ic
similarity index 100%
rename from include/row0ins.ic
rename to storage/xtradb/include/row0ins.ic
diff --git a/include/row0log.h b/storage/xtradb/include/row0log.h
similarity index 100%
rename from include/row0log.h
rename to storage/xtradb/include/row0log.h
diff --git a/include/row0log.ic b/storage/xtradb/include/row0log.ic
similarity index 100%
rename from include/row0log.ic
rename to storage/xtradb/include/row0log.ic
diff --git a/include/row0merge.h b/storage/xtradb/include/row0merge.h
similarity index 100%
rename from include/row0merge.h
rename to storage/xtradb/include/row0merge.h
diff --git a/include/row0mysql.h b/storage/xtradb/include/row0mysql.h
similarity index 100%
rename from include/row0mysql.h
rename to storage/xtradb/include/row0mysql.h
diff --git a/include/row0mysql.ic b/storage/xtradb/include/row0mysql.ic
similarity index 100%
rename from include/row0mysql.ic
rename to storage/xtradb/include/row0mysql.ic
diff --git a/include/row0purge.h b/storage/xtradb/include/row0purge.h
similarity index 100%
rename from include/row0purge.h
rename to storage/xtradb/include/row0purge.h
diff --git a/include/row0purge.ic b/storage/xtradb/include/row0purge.ic
similarity index 100%
rename from include/row0purge.ic
rename to storage/xtradb/include/row0purge.ic
diff --git a/include/row0quiesce.h b/storage/xtradb/include/row0quiesce.h
similarity index 100%
rename from include/row0quiesce.h
rename to storage/xtradb/include/row0quiesce.h
diff --git a/include/row0quiesce.ic b/storage/xtradb/include/row0quiesce.ic
similarity index 100%
rename from include/row0quiesce.ic
rename to storage/xtradb/include/row0quiesce.ic
diff --git a/include/row0row.h b/storage/xtradb/include/row0row.h
similarity index 100%
rename from include/row0row.h
rename to storage/xtradb/include/row0row.h
diff --git a/include/row0row.ic b/storage/xtradb/include/row0row.ic
similarity index 100%
rename from include/row0row.ic
rename to storage/xtradb/include/row0row.ic
diff --git a/include/row0sel.h b/storage/xtradb/include/row0sel.h
similarity index 100%
rename from include/row0sel.h
rename to storage/xtradb/include/row0sel.h
diff --git a/include/row0sel.ic b/storage/xtradb/include/row0sel.ic
similarity index 100%
rename from include/row0sel.ic
rename to storage/xtradb/include/row0sel.ic
diff --git a/include/row0types.h b/storage/xtradb/include/row0types.h
similarity index 100%
rename from include/row0types.h
rename to storage/xtradb/include/row0types.h
diff --git a/include/row0uins.h b/storage/xtradb/include/row0uins.h
similarity index 100%
rename from include/row0uins.h
rename to storage/xtradb/include/row0uins.h
diff --git a/include/row0uins.ic b/storage/xtradb/include/row0uins.ic
similarity index 100%
rename from include/row0uins.ic
rename to storage/xtradb/include/row0uins.ic
diff --git a/include/row0umod.h b/storage/xtradb/include/row0umod.h
similarity index 100%
rename from include/row0umod.h
rename to storage/xtradb/include/row0umod.h
diff --git a/include/row0umod.ic b/storage/xtradb/include/row0umod.ic
similarity index 100%
rename from include/row0umod.ic
rename to storage/xtradb/include/row0umod.ic
diff --git a/include/row0undo.h b/storage/xtradb/include/row0undo.h
similarity index 100%
rename from include/row0undo.h
rename to storage/xtradb/include/row0undo.h
diff --git a/include/row0undo.ic b/storage/xtradb/include/row0undo.ic
similarity index 100%
rename from include/row0undo.ic
rename to storage/xtradb/include/row0undo.ic
diff --git a/include/row0upd.h b/storage/xtradb/include/row0upd.h
similarity index 100%
rename from include/row0upd.h
rename to storage/xtradb/include/row0upd.h
diff --git a/include/row0upd.ic b/storage/xtradb/include/row0upd.ic
similarity index 100%
rename from include/row0upd.ic
rename to storage/xtradb/include/row0upd.ic
diff --git a/include/row0vers.h b/storage/xtradb/include/row0vers.h
similarity index 100%
rename from include/row0vers.h
rename to storage/xtradb/include/row0vers.h
diff --git a/include/row0vers.ic b/storage/xtradb/include/row0vers.ic
similarity index 100%
rename from include/row0vers.ic
rename to storage/xtradb/include/row0vers.ic
diff --git a/include/srv0conc.h b/storage/xtradb/include/srv0conc.h
similarity index 100%
rename from include/srv0conc.h
rename to storage/xtradb/include/srv0conc.h
diff --git a/include/srv0mon.h b/storage/xtradb/include/srv0mon.h
similarity index 100%
rename from include/srv0mon.h
rename to storage/xtradb/include/srv0mon.h
diff --git a/include/srv0mon.ic b/storage/xtradb/include/srv0mon.ic
similarity index 100%
rename from include/srv0mon.ic
rename to storage/xtradb/include/srv0mon.ic
diff --git a/include/srv0srv.h b/storage/xtradb/include/srv0srv.h
similarity index 100%
rename from include/srv0srv.h
rename to storage/xtradb/include/srv0srv.h
diff --git a/include/srv0srv.ic b/storage/xtradb/include/srv0srv.ic
similarity index 100%
rename from include/srv0srv.ic
rename to storage/xtradb/include/srv0srv.ic
diff --git a/include/srv0start.h b/storage/xtradb/include/srv0start.h
similarity index 100%
rename from include/srv0start.h
rename to storage/xtradb/include/srv0start.h
diff --git a/include/sync0arr.h b/storage/xtradb/include/sync0arr.h
similarity index 100%
rename from include/sync0arr.h
rename to storage/xtradb/include/sync0arr.h
diff --git a/include/sync0arr.ic b/storage/xtradb/include/sync0arr.ic
similarity index 100%
rename from include/sync0arr.ic
rename to storage/xtradb/include/sync0arr.ic
diff --git a/include/sync0rw.h b/storage/xtradb/include/sync0rw.h
similarity index 100%
rename from include/sync0rw.h
rename to storage/xtradb/include/sync0rw.h
diff --git a/include/sync0rw.ic b/storage/xtradb/include/sync0rw.ic
similarity index 100%
rename from include/sync0rw.ic
rename to storage/xtradb/include/sync0rw.ic
diff --git a/include/sync0sync.h b/storage/xtradb/include/sync0sync.h
similarity index 100%
rename from include/sync0sync.h
rename to storage/xtradb/include/sync0sync.h
diff --git a/include/sync0sync.ic b/storage/xtradb/include/sync0sync.ic
similarity index 100%
rename from include/sync0sync.ic
rename to storage/xtradb/include/sync0sync.ic
diff --git a/include/sync0types.h b/storage/xtradb/include/sync0types.h
similarity index 100%
rename from include/sync0types.h
rename to storage/xtradb/include/sync0types.h
diff --git a/include/trx0i_s.h b/storage/xtradb/include/trx0i_s.h
similarity index 100%
rename from include/trx0i_s.h
rename to storage/xtradb/include/trx0i_s.h
diff --git a/include/trx0purge.h b/storage/xtradb/include/trx0purge.h
similarity index 100%
rename from include/trx0purge.h
rename to storage/xtradb/include/trx0purge.h
diff --git a/include/trx0purge.ic b/storage/xtradb/include/trx0purge.ic
similarity index 100%
rename from include/trx0purge.ic
rename to storage/xtradb/include/trx0purge.ic
diff --git a/include/trx0rec.h b/storage/xtradb/include/trx0rec.h
similarity index 100%
rename from include/trx0rec.h
rename to storage/xtradb/include/trx0rec.h
diff --git a/include/trx0rec.ic b/storage/xtradb/include/trx0rec.ic
similarity index 100%
rename from include/trx0rec.ic
rename to storage/xtradb/include/trx0rec.ic
diff --git a/include/trx0roll.h b/storage/xtradb/include/trx0roll.h
similarity index 100%
rename from include/trx0roll.h
rename to storage/xtradb/include/trx0roll.h
diff --git a/include/trx0roll.ic b/storage/xtradb/include/trx0roll.ic
similarity index 100%
rename from include/trx0roll.ic
rename to storage/xtradb/include/trx0roll.ic
diff --git a/include/trx0rseg.h b/storage/xtradb/include/trx0rseg.h
similarity index 100%
rename from include/trx0rseg.h
rename to storage/xtradb/include/trx0rseg.h
diff --git a/include/trx0rseg.ic b/storage/xtradb/include/trx0rseg.ic
similarity index 100%
rename from include/trx0rseg.ic
rename to storage/xtradb/include/trx0rseg.ic
diff --git a/include/trx0sys.h b/storage/xtradb/include/trx0sys.h
similarity index 100%
rename from include/trx0sys.h
rename to storage/xtradb/include/trx0sys.h
diff --git a/include/trx0sys.ic b/storage/xtradb/include/trx0sys.ic
similarity index 100%
rename from include/trx0sys.ic
rename to storage/xtradb/include/trx0sys.ic
diff --git a/include/trx0trx.h b/storage/xtradb/include/trx0trx.h
similarity index 100%
rename from include/trx0trx.h
rename to storage/xtradb/include/trx0trx.h
diff --git a/include/trx0trx.ic b/storage/xtradb/include/trx0trx.ic
similarity index 100%
rename from include/trx0trx.ic
rename to storage/xtradb/include/trx0trx.ic
diff --git a/include/trx0types.h b/storage/xtradb/include/trx0types.h
similarity index 100%
rename from include/trx0types.h
rename to storage/xtradb/include/trx0types.h
diff --git a/include/trx0undo.h b/storage/xtradb/include/trx0undo.h
similarity index 100%
rename from include/trx0undo.h
rename to storage/xtradb/include/trx0undo.h
diff --git a/include/trx0undo.ic b/storage/xtradb/include/trx0undo.ic
similarity index 100%
rename from include/trx0undo.ic
rename to storage/xtradb/include/trx0undo.ic
diff --git a/include/trx0xa.h b/storage/xtradb/include/trx0xa.h
similarity index 100%
rename from include/trx0xa.h
rename to storage/xtradb/include/trx0xa.h
diff --git a/include/univ.i b/storage/xtradb/include/univ.i
similarity index 100%
rename from include/univ.i
rename to storage/xtradb/include/univ.i
diff --git a/include/usr0sess.h b/storage/xtradb/include/usr0sess.h
similarity index 100%
rename from include/usr0sess.h
rename to storage/xtradb/include/usr0sess.h
diff --git a/include/usr0sess.ic b/storage/xtradb/include/usr0sess.ic
similarity index 100%
rename from include/usr0sess.ic
rename to storage/xtradb/include/usr0sess.ic
diff --git a/include/usr0types.h b/storage/xtradb/include/usr0types.h
similarity index 100%
rename from include/usr0types.h
rename to storage/xtradb/include/usr0types.h
diff --git a/include/ut0bh.h b/storage/xtradb/include/ut0bh.h
similarity index 100%
rename from include/ut0bh.h
rename to storage/xtradb/include/ut0bh.h
diff --git a/include/ut0bh.ic b/storage/xtradb/include/ut0bh.ic
similarity index 100%
rename from include/ut0bh.ic
rename to storage/xtradb/include/ut0bh.ic
diff --git a/include/ut0byte.h b/storage/xtradb/include/ut0byte.h
similarity index 100%
rename from include/ut0byte.h
rename to storage/xtradb/include/ut0byte.h
diff --git a/include/ut0byte.ic b/storage/xtradb/include/ut0byte.ic
similarity index 100%
rename from include/ut0byte.ic
rename to storage/xtradb/include/ut0byte.ic
diff --git a/include/ut0counter.h b/storage/xtradb/include/ut0counter.h
similarity index 100%
rename from include/ut0counter.h
rename to storage/xtradb/include/ut0counter.h
diff --git a/include/ut0crc32.h b/storage/xtradb/include/ut0crc32.h
similarity index 100%
rename from include/ut0crc32.h
rename to storage/xtradb/include/ut0crc32.h
diff --git a/include/ut0dbg.h b/storage/xtradb/include/ut0dbg.h
similarity index 100%
rename from include/ut0dbg.h
rename to storage/xtradb/include/ut0dbg.h
diff --git a/include/ut0list.h b/storage/xtradb/include/ut0list.h
similarity index 100%
rename from include/ut0list.h
rename to storage/xtradb/include/ut0list.h
diff --git a/include/ut0list.ic b/storage/xtradb/include/ut0list.ic
similarity index 100%
rename from include/ut0list.ic
rename to storage/xtradb/include/ut0list.ic
diff --git a/include/ut0lst.h b/storage/xtradb/include/ut0lst.h
similarity index 100%
rename from include/ut0lst.h
rename to storage/xtradb/include/ut0lst.h
diff --git a/include/ut0mem.h b/storage/xtradb/include/ut0mem.h
similarity index 100%
rename from include/ut0mem.h
rename to storage/xtradb/include/ut0mem.h
diff --git a/include/ut0mem.ic b/storage/xtradb/include/ut0mem.ic
similarity index 100%
rename from include/ut0mem.ic
rename to storage/xtradb/include/ut0mem.ic
diff --git a/include/ut0rbt.h b/storage/xtradb/include/ut0rbt.h
similarity index 100%
rename from include/ut0rbt.h
rename to storage/xtradb/include/ut0rbt.h
diff --git a/include/ut0rnd.h b/storage/xtradb/include/ut0rnd.h
similarity index 100%
rename from include/ut0rnd.h
rename to storage/xtradb/include/ut0rnd.h
diff --git a/include/ut0rnd.ic b/storage/xtradb/include/ut0rnd.ic
similarity index 100%
rename from include/ut0rnd.ic
rename to storage/xtradb/include/ut0rnd.ic
diff --git a/include/ut0sort.h b/storage/xtradb/include/ut0sort.h
similarity index 100%
rename from include/ut0sort.h
rename to storage/xtradb/include/ut0sort.h
diff --git a/include/ut0ut.h b/storage/xtradb/include/ut0ut.h
similarity index 100%
rename from include/ut0ut.h
rename to storage/xtradb/include/ut0ut.h
diff --git a/include/ut0ut.ic b/storage/xtradb/include/ut0ut.ic
similarity index 100%
rename from include/ut0ut.ic
rename to storage/xtradb/include/ut0ut.ic
diff --git a/include/ut0vec.h b/storage/xtradb/include/ut0vec.h
similarity index 100%
rename from include/ut0vec.h
rename to storage/xtradb/include/ut0vec.h
diff --git a/include/ut0vec.ic b/storage/xtradb/include/ut0vec.ic
similarity index 100%
rename from include/ut0vec.ic
rename to storage/xtradb/include/ut0vec.ic
diff --git a/include/ut0wqueue.h b/storage/xtradb/include/ut0wqueue.h
similarity index 100%
rename from include/ut0wqueue.h
rename to storage/xtradb/include/ut0wqueue.h
diff --git a/lock/lock0iter.cc b/storage/xtradb/lock/lock0iter.cc
similarity index 100%
rename from lock/lock0iter.cc
rename to storage/xtradb/lock/lock0iter.cc
diff --git a/lock/lock0lock.cc b/storage/xtradb/lock/lock0lock.cc
similarity index 100%
rename from lock/lock0lock.cc
rename to storage/xtradb/lock/lock0lock.cc
diff --git a/lock/lock0wait.cc b/storage/xtradb/lock/lock0wait.cc
similarity index 100%
rename from lock/lock0wait.cc
rename to storage/xtradb/lock/lock0wait.cc
diff --git a/log/log0log.cc b/storage/xtradb/log/log0log.cc
similarity index 100%
rename from log/log0log.cc
rename to storage/xtradb/log/log0log.cc
diff --git a/log/log0online.cc b/storage/xtradb/log/log0online.cc
similarity index 100%
rename from log/log0online.cc
rename to storage/xtradb/log/log0online.cc
diff --git a/log/log0recv.cc b/storage/xtradb/log/log0recv.cc
similarity index 100%
rename from log/log0recv.cc
rename to storage/xtradb/log/log0recv.cc
diff --git a/mach/mach0data.cc b/storage/xtradb/mach/mach0data.cc
similarity index 100%
rename from mach/mach0data.cc
rename to storage/xtradb/mach/mach0data.cc
diff --git a/mem/mem0dbg.cc b/storage/xtradb/mem/mem0dbg.cc
similarity index 100%
rename from mem/mem0dbg.cc
rename to storage/xtradb/mem/mem0dbg.cc
diff --git a/mem/mem0mem.cc b/storage/xtradb/mem/mem0mem.cc
similarity index 100%
rename from mem/mem0mem.cc
rename to storage/xtradb/mem/mem0mem.cc
diff --git a/mem/mem0pool.cc b/storage/xtradb/mem/mem0pool.cc
similarity index 100%
rename from mem/mem0pool.cc
rename to storage/xtradb/mem/mem0pool.cc
diff --git a/mtr/mtr0log.cc b/storage/xtradb/mtr/mtr0log.cc
similarity index 100%
rename from mtr/mtr0log.cc
rename to storage/xtradb/mtr/mtr0log.cc
diff --git a/mtr/mtr0mtr.cc b/storage/xtradb/mtr/mtr0mtr.cc
similarity index 100%
rename from mtr/mtr0mtr.cc
rename to storage/xtradb/mtr/mtr0mtr.cc
diff --git a/os/os0file.cc b/storage/xtradb/os/os0file.cc
similarity index 100%
rename from os/os0file.cc
rename to storage/xtradb/os/os0file.cc
diff --git a/os/os0proc.cc b/storage/xtradb/os/os0proc.cc
similarity index 100%
rename from os/os0proc.cc
rename to storage/xtradb/os/os0proc.cc
diff --git a/os/os0sync.cc b/storage/xtradb/os/os0sync.cc
similarity index 100%
rename from os/os0sync.cc
rename to storage/xtradb/os/os0sync.cc
diff --git a/os/os0thread.cc b/storage/xtradb/os/os0thread.cc
similarity index 100%
rename from os/os0thread.cc
rename to storage/xtradb/os/os0thread.cc
diff --git a/page/page0cur.cc b/storage/xtradb/page/page0cur.cc
similarity index 100%
rename from page/page0cur.cc
rename to storage/xtradb/page/page0cur.cc
diff --git a/page/page0page.cc b/storage/xtradb/page/page0page.cc
similarity index 100%
rename from page/page0page.cc
rename to storage/xtradb/page/page0page.cc
diff --git a/page/page0zip.cc b/storage/xtradb/page/page0zip.cc
similarity index 100%
rename from page/page0zip.cc
rename to storage/xtradb/page/page0zip.cc
diff --git a/pars/lexyy.cc b/storage/xtradb/pars/lexyy.cc
similarity index 100%
rename from pars/lexyy.cc
rename to storage/xtradb/pars/lexyy.cc
diff --git a/pars/make_bison.sh b/storage/xtradb/pars/make_bison.sh
similarity index 100%
rename from pars/make_bison.sh
rename to storage/xtradb/pars/make_bison.sh
diff --git a/pars/make_flex.sh b/storage/xtradb/pars/make_flex.sh
similarity index 100%
rename from pars/make_flex.sh
rename to storage/xtradb/pars/make_flex.sh
diff --git a/pars/pars0grm.cc b/storage/xtradb/pars/pars0grm.cc
similarity index 100%
rename from pars/pars0grm.cc
rename to storage/xtradb/pars/pars0grm.cc
diff --git a/pars/pars0grm.y b/storage/xtradb/pars/pars0grm.y
similarity index 100%
rename from pars/pars0grm.y
rename to storage/xtradb/pars/pars0grm.y
diff --git a/pars/pars0lex.l b/storage/xtradb/pars/pars0lex.l
similarity index 100%
rename from pars/pars0lex.l
rename to storage/xtradb/pars/pars0lex.l
diff --git a/pars/pars0opt.cc b/storage/xtradb/pars/pars0opt.cc
similarity index 100%
rename from pars/pars0opt.cc
rename to storage/xtradb/pars/pars0opt.cc
diff --git a/pars/pars0pars.cc b/storage/xtradb/pars/pars0pars.cc
similarity index 100%
rename from pars/pars0pars.cc
rename to storage/xtradb/pars/pars0pars.cc
diff --git a/pars/pars0sym.cc b/storage/xtradb/pars/pars0sym.cc
similarity index 100%
rename from pars/pars0sym.cc
rename to storage/xtradb/pars/pars0sym.cc
diff --git a/que/que0que.cc b/storage/xtradb/que/que0que.cc
similarity index 100%
rename from que/que0que.cc
rename to storage/xtradb/que/que0que.cc
diff --git a/read/read0read.cc b/storage/xtradb/read/read0read.cc
similarity index 100%
rename from read/read0read.cc
rename to storage/xtradb/read/read0read.cc
diff --git a/rem/rem0cmp.cc b/storage/xtradb/rem/rem0cmp.cc
similarity index 100%
rename from rem/rem0cmp.cc
rename to storage/xtradb/rem/rem0cmp.cc
diff --git a/rem/rem0rec.cc b/storage/xtradb/rem/rem0rec.cc
similarity index 100%
rename from rem/rem0rec.cc
rename to storage/xtradb/rem/rem0rec.cc
diff --git a/row/row0ext.cc b/storage/xtradb/row/row0ext.cc
similarity index 100%
rename from row/row0ext.cc
rename to storage/xtradb/row/row0ext.cc
diff --git a/row/row0ftsort.cc b/storage/xtradb/row/row0ftsort.cc
similarity index 100%
rename from row/row0ftsort.cc
rename to storage/xtradb/row/row0ftsort.cc
diff --git a/row/row0import.cc b/storage/xtradb/row/row0import.cc
similarity index 100%
rename from row/row0import.cc
rename to storage/xtradb/row/row0import.cc
diff --git a/row/row0ins.cc b/storage/xtradb/row/row0ins.cc
similarity index 100%
rename from row/row0ins.cc
rename to storage/xtradb/row/row0ins.cc
diff --git a/row/row0log.cc b/storage/xtradb/row/row0log.cc
similarity index 100%
rename from row/row0log.cc
rename to storage/xtradb/row/row0log.cc
diff --git a/row/row0merge.cc b/storage/xtradb/row/row0merge.cc
similarity index 100%
rename from row/row0merge.cc
rename to storage/xtradb/row/row0merge.cc
diff --git a/row/row0mysql.cc b/storage/xtradb/row/row0mysql.cc
similarity index 100%
rename from row/row0mysql.cc
rename to storage/xtradb/row/row0mysql.cc
diff --git a/row/row0purge.cc b/storage/xtradb/row/row0purge.cc
similarity index 100%
rename from row/row0purge.cc
rename to storage/xtradb/row/row0purge.cc
diff --git a/row/row0quiesce.cc b/storage/xtradb/row/row0quiesce.cc
similarity index 100%
rename from row/row0quiesce.cc
rename to storage/xtradb/row/row0quiesce.cc
diff --git a/row/row0row.cc b/storage/xtradb/row/row0row.cc
similarity index 100%
rename from row/row0row.cc
rename to storage/xtradb/row/row0row.cc
diff --git a/row/row0sel.cc b/storage/xtradb/row/row0sel.cc
similarity index 100%
rename from row/row0sel.cc
rename to storage/xtradb/row/row0sel.cc
diff --git a/row/row0uins.cc b/storage/xtradb/row/row0uins.cc
similarity index 100%
rename from row/row0uins.cc
rename to storage/xtradb/row/row0uins.cc
diff --git a/row/row0umod.cc b/storage/xtradb/row/row0umod.cc
similarity index 100%
rename from row/row0umod.cc
rename to storage/xtradb/row/row0umod.cc
diff --git a/row/row0undo.cc b/storage/xtradb/row/row0undo.cc
similarity index 100%
rename from row/row0undo.cc
rename to storage/xtradb/row/row0undo.cc
diff --git a/row/row0upd.cc b/storage/xtradb/row/row0upd.cc
similarity index 100%
rename from row/row0upd.cc
rename to storage/xtradb/row/row0upd.cc
diff --git a/row/row0vers.cc b/storage/xtradb/row/row0vers.cc
similarity index 100%
rename from row/row0vers.cc
rename to storage/xtradb/row/row0vers.cc
diff --git a/srv/srv0conc.cc b/storage/xtradb/srv/srv0conc.cc
similarity index 100%
rename from srv/srv0conc.cc
rename to storage/xtradb/srv/srv0conc.cc
diff --git a/srv/srv0mon.cc b/storage/xtradb/srv/srv0mon.cc
similarity index 100%
rename from srv/srv0mon.cc
rename to storage/xtradb/srv/srv0mon.cc
diff --git a/srv/srv0srv.cc b/storage/xtradb/srv/srv0srv.cc
similarity index 100%
rename from srv/srv0srv.cc
rename to storage/xtradb/srv/srv0srv.cc
diff --git a/srv/srv0start.cc b/storage/xtradb/srv/srv0start.cc
similarity index 100%
rename from srv/srv0start.cc
rename to storage/xtradb/srv/srv0start.cc
diff --git a/sync/sync0arr.cc b/storage/xtradb/sync/sync0arr.cc
similarity index 100%
rename from sync/sync0arr.cc
rename to storage/xtradb/sync/sync0arr.cc
diff --git a/sync/sync0rw.cc b/storage/xtradb/sync/sync0rw.cc
similarity index 100%
rename from sync/sync0rw.cc
rename to storage/xtradb/sync/sync0rw.cc
diff --git a/sync/sync0sync.cc b/storage/xtradb/sync/sync0sync.cc
similarity index 100%
rename from sync/sync0sync.cc
rename to storage/xtradb/sync/sync0sync.cc
diff --git a/trx/trx0i_s.cc b/storage/xtradb/trx/trx0i_s.cc
similarity index 100%
rename from trx/trx0i_s.cc
rename to storage/xtradb/trx/trx0i_s.cc
diff --git a/trx/trx0purge.cc b/storage/xtradb/trx/trx0purge.cc
similarity index 100%
rename from trx/trx0purge.cc
rename to storage/xtradb/trx/trx0purge.cc
diff --git a/trx/trx0rec.cc b/storage/xtradb/trx/trx0rec.cc
similarity index 100%
rename from trx/trx0rec.cc
rename to storage/xtradb/trx/trx0rec.cc
diff --git a/trx/trx0roll.cc b/storage/xtradb/trx/trx0roll.cc
similarity index 100%
rename from trx/trx0roll.cc
rename to storage/xtradb/trx/trx0roll.cc
diff --git a/trx/trx0rseg.cc b/storage/xtradb/trx/trx0rseg.cc
similarity index 100%
rename from trx/trx0rseg.cc
rename to storage/xtradb/trx/trx0rseg.cc
diff --git a/trx/trx0sys.cc b/storage/xtradb/trx/trx0sys.cc
similarity index 100%
rename from trx/trx0sys.cc
rename to storage/xtradb/trx/trx0sys.cc
diff --git a/trx/trx0trx.cc b/storage/xtradb/trx/trx0trx.cc
similarity index 100%
rename from trx/trx0trx.cc
rename to storage/xtradb/trx/trx0trx.cc
diff --git a/trx/trx0undo.cc b/storage/xtradb/trx/trx0undo.cc
similarity index 100%
rename from trx/trx0undo.cc
rename to storage/xtradb/trx/trx0undo.cc
diff --git a/usr/usr0sess.cc b/storage/xtradb/usr/usr0sess.cc
similarity index 100%
rename from usr/usr0sess.cc
rename to storage/xtradb/usr/usr0sess.cc
diff --git a/ut/ut0bh.cc b/storage/xtradb/ut/ut0bh.cc
similarity index 100%
rename from ut/ut0bh.cc
rename to storage/xtradb/ut/ut0bh.cc
diff --git a/ut/ut0byte.cc b/storage/xtradb/ut/ut0byte.cc
similarity index 100%
rename from ut/ut0byte.cc
rename to storage/xtradb/ut/ut0byte.cc
diff --git a/ut/ut0crc32.cc b/storage/xtradb/ut/ut0crc32.cc
similarity index 100%
rename from ut/ut0crc32.cc
rename to storage/xtradb/ut/ut0crc32.cc
diff --git a/ut/ut0dbg.cc b/storage/xtradb/ut/ut0dbg.cc
similarity index 100%
rename from ut/ut0dbg.cc
rename to storage/xtradb/ut/ut0dbg.cc
diff --git a/ut/ut0list.cc b/storage/xtradb/ut/ut0list.cc
similarity index 100%
rename from ut/ut0list.cc
rename to storage/xtradb/ut/ut0list.cc
diff --git a/ut/ut0mem.cc b/storage/xtradb/ut/ut0mem.cc
similarity index 100%
rename from ut/ut0mem.cc
rename to storage/xtradb/ut/ut0mem.cc
diff --git a/ut/ut0rbt.cc b/storage/xtradb/ut/ut0rbt.cc
similarity index 100%
rename from ut/ut0rbt.cc
rename to storage/xtradb/ut/ut0rbt.cc
diff --git a/ut/ut0rnd.cc b/storage/xtradb/ut/ut0rnd.cc
similarity index 100%
rename from ut/ut0rnd.cc
rename to storage/xtradb/ut/ut0rnd.cc
diff --git a/ut/ut0ut.cc b/storage/xtradb/ut/ut0ut.cc
similarity index 100%
rename from ut/ut0ut.cc
rename to storage/xtradb/ut/ut0ut.cc
diff --git a/ut/ut0vec.cc b/storage/xtradb/ut/ut0vec.cc
similarity index 100%
rename from ut/ut0vec.cc
rename to storage/xtradb/ut/ut0vec.cc
diff --git a/ut/ut0wqueue.cc b/storage/xtradb/ut/ut0wqueue.cc
similarity index 100%
rename from ut/ut0wqueue.cc
rename to storage/xtradb/ut/ut0wqueue.cc