diff --git a/Rakefile b/Rakefile
index dfd1a008ad..3731b38801 100644
--- a/Rakefile
+++ b/Rakefile
@@ -21,7 +21,7 @@ if RUBY_ENGINE == "jruby"
     require 'maven/ruby/maven'
     ext.source_version = '1.8'
     ext.target_version = '1.8'
-    ext.ext_dir = 'ext/java'
+    ext.ext_dir = 'ext/jruby'
   end
 elsif RUBY_ENGINE == "ruby"
   require 'rake/extensiontask'
@@ -32,8 +32,8 @@ end
 
 desc "Run test"
 task :test do
-  require_path = RUBY_ENGINE == 'jruby' ? "lib/jruby" : "lib"
-  ENV["RUBYOPT"] = "-I#{require_path} -rbundler/setup"
+  extra_require_path = RUBY_ENGINE == 'jruby' ? "ext/jruby/lib" : "lib"
+  ENV["RUBYOPT"] = "-I#{extra_require_path} -rbundler/setup"
   ruby("run-test.rb")
 end
 
diff --git a/lib/jruby/strscan.rb b/ext/jruby/lib/strscan.rb
similarity index 100%
rename from lib/jruby/strscan.rb
rename to ext/jruby/lib/strscan.rb
diff --git a/ext/java/org/jruby/ext/strscan/RubyStringScanner.java b/ext/jruby/org/jruby/ext/strscan/RubyStringScanner.java
similarity index 100%
rename from ext/java/org/jruby/ext/strscan/RubyStringScanner.java
rename to ext/jruby/org/jruby/ext/strscan/RubyStringScanner.java
diff --git a/ext/java/org/jruby/ext/strscan/StringScannerLibrary.java b/ext/jruby/org/jruby/ext/strscan/StringScannerLibrary.java
similarity index 100%
rename from ext/java/org/jruby/ext/strscan/StringScannerLibrary.java
rename to ext/jruby/org/jruby/ext/strscan/StringScannerLibrary.java
diff --git a/strscan.gemspec b/strscan.gemspec
index 16731fcdbe..28cef7a433 100644
--- a/strscan.gemspec
+++ b/strscan.gemspec
@@ -17,8 +17,8 @@ Gem::Specification.new do |s|
   s.description = "Provides lexical scanning operations on a String."
 
   if RUBY_ENGINE == 'jruby'
-    s.require_paths = %w{lib/jruby lib}
-    s.files = %w{lib/strscan.jar lib/jruby/strscan.rb}
+    s.require_paths = %w{ext/jruby/lib lib}
+    s.files = %w{lib/strscan.jar ext/jruby/lib/strscan.rb}
     s.platform = "java"
   else
     s.require_paths = %w{lib}