diff --git a/cache/memcache.go b/cache/memcache/memcache.go
similarity index 100%
rename from cache/memcache.go
rename to cache/memcache/memcache.go
diff --git a/cache/redis.go b/cache/redis/redis.go
similarity index 100%
rename from cache/redis.go
rename to cache/redis/redis.go
diff --git a/config/xml.go b/config/xml/xml.go
similarity index 100%
rename from config/xml.go
rename to config/xml/xml.go
diff --git a/config/xml_test.go b/config/xml/xml_test.go
similarity index 100%
rename from config/xml_test.go
rename to config/xml/xml_test.go
diff --git a/config/yaml.go b/config/yaml/yaml.go
similarity index 100%
rename from config/yaml.go
rename to config/yaml/yaml.go
diff --git a/config/yaml_test.go b/config/yaml/yaml_test.go
similarity index 100%
rename from config/yaml_test.go
rename to config/yaml/yaml_test.go
diff --git a/session/sess_couchbase.go b/session/couchbase/sess_couchbase.go
similarity index 100%
rename from session/sess_couchbase.go
rename to session/couchbase/sess_couchbase.go
diff --git a/session/sess_mysql.go b/session/mysql/sess_mysql.go
similarity index 100%
rename from session/sess_mysql.go
rename to session/mysql/sess_mysql.go
diff --git a/session/sess_postgresql.go b/session/postgres/sess_postgresql.go
similarity index 100%
rename from session/sess_postgresql.go
rename to session/postgres/sess_postgresql.go
diff --git a/session/sess_redis.go b/session/redis/sess_redis.go
similarity index 100%
rename from session/sess_redis.go
rename to session/redis/sess_redis.go