diff --git a/Rakefile b/Rakefile
index c5b518a1..ab87adae 100644
--- a/Rakefile
+++ b/Rakefile
@@ -30,7 +30,7 @@ PKG_VERSION       = File.foreach(File.join(__dir__, "lib/json/version.rb")) do |
   /^\s*VERSION\s*=\s*'(.*)'/ =~ line and break $1
 end rescue nil
 
-EXT_ROOT_DIR      = 'ext/json/ext'
+EXT_ROOT_DIR      = 'ext/json'
 EXT_PARSER_DIR    = "#{EXT_ROOT_DIR}/parser"
 EXT_PARSER_DL     = "#{EXT_PARSER_DIR}/parser.#{CONFIG['DLEXT']}"
 RAGEL_PATH        = "#{EXT_PARSER_DIR}/parser.rl"
diff --git a/ext/json/ext/fbuffer/fbuffer.h b/ext/json/fbuffer/fbuffer.h
similarity index 100%
rename from ext/json/ext/fbuffer/fbuffer.h
rename to ext/json/fbuffer/fbuffer.h
diff --git a/ext/json/ext/generator/depend b/ext/json/generator/depend
similarity index 100%
rename from ext/json/ext/generator/depend
rename to ext/json/generator/depend
diff --git a/ext/json/ext/generator/extconf.rb b/ext/json/generator/extconf.rb
similarity index 100%
rename from ext/json/ext/generator/extconf.rb
rename to ext/json/generator/extconf.rb
diff --git a/ext/json/ext/generator/generator.c b/ext/json/generator/generator.c
similarity index 100%
rename from ext/json/ext/generator/generator.c
rename to ext/json/generator/generator.c
diff --git a/ext/json/ext/parser/depend b/ext/json/parser/depend
similarity index 100%
rename from ext/json/ext/parser/depend
rename to ext/json/parser/depend
diff --git a/ext/json/ext/parser/extconf.rb b/ext/json/parser/extconf.rb
similarity index 100%
rename from ext/json/ext/parser/extconf.rb
rename to ext/json/parser/extconf.rb
diff --git a/ext/json/ext/parser/parser.c b/ext/json/parser/parser.c
similarity index 100%
rename from ext/json/ext/parser/parser.c
rename to ext/json/parser/parser.c
diff --git a/ext/json/ext/parser/parser.rl b/ext/json/parser/parser.rl
similarity index 100%
rename from ext/json/ext/parser/parser.rl
rename to ext/json/parser/parser.rl