diff --git a/captcha/pom.xml b/sandbox/captcha/pom.xml
similarity index 100%
rename from captcha/pom.xml
rename to sandbox/captcha/pom.xml
diff --git a/captcha/src/main/java/org/springframework/security/captcha/AlwaysTestAfterMaxRequestsCaptchaChannelProcessor.java b/sandbox/captcha/src/main/java/org/springframework/security/captcha/AlwaysTestAfterMaxRequestsCaptchaChannelProcessor.java
similarity index 100%
rename from captcha/src/main/java/org/springframework/security/captcha/AlwaysTestAfterMaxRequestsCaptchaChannelProcessor.java
rename to sandbox/captcha/src/main/java/org/springframework/security/captcha/AlwaysTestAfterMaxRequestsCaptchaChannelProcessor.java
diff --git a/captcha/src/main/java/org/springframework/security/captcha/AlwaysTestAfterTimeInMillisCaptchaChannelProcessor.java b/sandbox/captcha/src/main/java/org/springframework/security/captcha/AlwaysTestAfterTimeInMillisCaptchaChannelProcessor.java
similarity index 100%
rename from captcha/src/main/java/org/springframework/security/captcha/AlwaysTestAfterTimeInMillisCaptchaChannelProcessor.java
rename to sandbox/captcha/src/main/java/org/springframework/security/captcha/AlwaysTestAfterTimeInMillisCaptchaChannelProcessor.java
diff --git a/captcha/src/main/java/org/springframework/security/captcha/AlwaysTestBelowAverageTimeInMillisBetweenRequestsChannelProcessor.java b/sandbox/captcha/src/main/java/org/springframework/security/captcha/AlwaysTestBelowAverageTimeInMillisBetweenRequestsChannelProcessor.java
similarity index 100%
rename from captcha/src/main/java/org/springframework/security/captcha/AlwaysTestBelowAverageTimeInMillisBetweenRequestsChannelProcessor.java
rename to sandbox/captcha/src/main/java/org/springframework/security/captcha/AlwaysTestBelowAverageTimeInMillisBetweenRequestsChannelProcessor.java
diff --git a/captcha/src/main/java/org/springframework/security/captcha/CaptchaChannelProcessorTemplate.java b/sandbox/captcha/src/main/java/org/springframework/security/captcha/CaptchaChannelProcessorTemplate.java
similarity index 100%
rename from captcha/src/main/java/org/springframework/security/captcha/CaptchaChannelProcessorTemplate.java
rename to sandbox/captcha/src/main/java/org/springframework/security/captcha/CaptchaChannelProcessorTemplate.java
diff --git a/captcha/src/main/java/org/springframework/security/captcha/CaptchaEntryPoint.java b/sandbox/captcha/src/main/java/org/springframework/security/captcha/CaptchaEntryPoint.java
similarity index 100%
rename from captcha/src/main/java/org/springframework/security/captcha/CaptchaEntryPoint.java
rename to sandbox/captcha/src/main/java/org/springframework/security/captcha/CaptchaEntryPoint.java
diff --git a/captcha/src/main/java/org/springframework/security/captcha/CaptchaSecurityContext.java b/sandbox/captcha/src/main/java/org/springframework/security/captcha/CaptchaSecurityContext.java
similarity index 100%
rename from captcha/src/main/java/org/springframework/security/captcha/CaptchaSecurityContext.java
rename to sandbox/captcha/src/main/java/org/springframework/security/captcha/CaptchaSecurityContext.java
diff --git a/captcha/src/main/java/org/springframework/security/captcha/CaptchaSecurityContextImpl.java b/sandbox/captcha/src/main/java/org/springframework/security/captcha/CaptchaSecurityContextImpl.java
similarity index 100%
rename from captcha/src/main/java/org/springframework/security/captcha/CaptchaSecurityContextImpl.java
rename to sandbox/captcha/src/main/java/org/springframework/security/captcha/CaptchaSecurityContextImpl.java
diff --git a/captcha/src/main/java/org/springframework/security/captcha/CaptchaServiceProxy.java b/sandbox/captcha/src/main/java/org/springframework/security/captcha/CaptchaServiceProxy.java
similarity index 100%
rename from captcha/src/main/java/org/springframework/security/captcha/CaptchaServiceProxy.java
rename to sandbox/captcha/src/main/java/org/springframework/security/captcha/CaptchaServiceProxy.java
diff --git a/captcha/src/main/java/org/springframework/security/captcha/CaptchaValidationProcessingFilter.java b/sandbox/captcha/src/main/java/org/springframework/security/captcha/CaptchaValidationProcessingFilter.java
similarity index 100%
rename from captcha/src/main/java/org/springframework/security/captcha/CaptchaValidationProcessingFilter.java
rename to sandbox/captcha/src/main/java/org/springframework/security/captcha/CaptchaValidationProcessingFilter.java
diff --git a/captcha/src/main/java/org/springframework/security/captcha/TestOnceAfterMaxRequestsCaptchaChannelProcessor.java b/sandbox/captcha/src/main/java/org/springframework/security/captcha/TestOnceAfterMaxRequestsCaptchaChannelProcessor.java
similarity index 100%
rename from captcha/src/main/java/org/springframework/security/captcha/TestOnceAfterMaxRequestsCaptchaChannelProcessor.java
rename to sandbox/captcha/src/main/java/org/springframework/security/captcha/TestOnceAfterMaxRequestsCaptchaChannelProcessor.java
diff --git a/captcha/src/main/java/org/springframework/security/captcha/package.html b/sandbox/captcha/src/main/java/org/springframework/security/captcha/package.html
similarity index 100%
rename from captcha/src/main/java/org/springframework/security/captcha/package.html
rename to sandbox/captcha/src/main/java/org/springframework/security/captcha/package.html
diff --git a/captcha/src/test/java/org/springframework/security/captcha/AlwaysTestAfterMaxRequestsCaptchaChannelProcessorTests.java b/sandbox/captcha/src/test/java/org/springframework/security/captcha/AlwaysTestAfterMaxRequestsCaptchaChannelProcessorTests.java
similarity index 100%
rename from captcha/src/test/java/org/springframework/security/captcha/AlwaysTestAfterMaxRequestsCaptchaChannelProcessorTests.java
rename to sandbox/captcha/src/test/java/org/springframework/security/captcha/AlwaysTestAfterMaxRequestsCaptchaChannelProcessorTests.java
diff --git a/captcha/src/test/java/org/springframework/security/captcha/AlwaysTestAfterTimeInMillisCaptchaChannelProcessorTests.java b/sandbox/captcha/src/test/java/org/springframework/security/captcha/AlwaysTestAfterTimeInMillisCaptchaChannelProcessorTests.java
similarity index 100%
rename from captcha/src/test/java/org/springframework/security/captcha/AlwaysTestAfterTimeInMillisCaptchaChannelProcessorTests.java
rename to sandbox/captcha/src/test/java/org/springframework/security/captcha/AlwaysTestAfterTimeInMillisCaptchaChannelProcessorTests.java
diff --git a/captcha/src/test/java/org/springframework/security/captcha/AlwaysTestBelowAverageTimeInMillisBetweenRequestsChannelProcessorTests.java b/sandbox/captcha/src/test/java/org/springframework/security/captcha/AlwaysTestBelowAverageTimeInMillisBetweenRequestsChannelProcessorTests.java
similarity index 100%
rename from captcha/src/test/java/org/springframework/security/captcha/AlwaysTestBelowAverageTimeInMillisBetweenRequestsChannelProcessorTests.java
rename to sandbox/captcha/src/test/java/org/springframework/security/captcha/AlwaysTestBelowAverageTimeInMillisBetweenRequestsChannelProcessorTests.java
diff --git a/captcha/src/test/java/org/springframework/security/captcha/CaptchaChannelProcessorTemplateTests.java b/sandbox/captcha/src/test/java/org/springframework/security/captcha/CaptchaChannelProcessorTemplateTests.java
similarity index 100%
rename from captcha/src/test/java/org/springframework/security/captcha/CaptchaChannelProcessorTemplateTests.java
rename to sandbox/captcha/src/test/java/org/springframework/security/captcha/CaptchaChannelProcessorTemplateTests.java
diff --git a/captcha/src/test/java/org/springframework/security/captcha/CaptchaEntryPointTests.java b/sandbox/captcha/src/test/java/org/springframework/security/captcha/CaptchaEntryPointTests.java
similarity index 100%
rename from captcha/src/test/java/org/springframework/security/captcha/CaptchaEntryPointTests.java
rename to sandbox/captcha/src/test/java/org/springframework/security/captcha/CaptchaEntryPointTests.java
diff --git a/captcha/src/test/java/org/springframework/security/captcha/CaptchaSecurityContextImplTests.java b/sandbox/captcha/src/test/java/org/springframework/security/captcha/CaptchaSecurityContextImplTests.java
similarity index 100%
rename from captcha/src/test/java/org/springframework/security/captcha/CaptchaSecurityContextImplTests.java
rename to sandbox/captcha/src/test/java/org/springframework/security/captcha/CaptchaSecurityContextImplTests.java
diff --git a/captcha/src/test/java/org/springframework/security/captcha/CaptchaValidationProcessingFilterTests.java b/sandbox/captcha/src/test/java/org/springframework/security/captcha/CaptchaValidationProcessingFilterTests.java
similarity index 100%
rename from captcha/src/test/java/org/springframework/security/captcha/CaptchaValidationProcessingFilterTests.java
rename to sandbox/captcha/src/test/java/org/springframework/security/captcha/CaptchaValidationProcessingFilterTests.java
diff --git a/captcha/src/test/java/org/springframework/security/captcha/MockCaptchaServiceProxy.java b/sandbox/captcha/src/test/java/org/springframework/security/captcha/MockCaptchaServiceProxy.java
similarity index 100%
rename from captcha/src/test/java/org/springframework/security/captcha/MockCaptchaServiceProxy.java
rename to sandbox/captcha/src/test/java/org/springframework/security/captcha/MockCaptchaServiceProxy.java
diff --git a/captcha/src/test/java/org/springframework/security/captcha/TestOnceAfterMaxRequestsCaptchaChannelProcessorTests.java b/sandbox/captcha/src/test/java/org/springframework/security/captcha/TestOnceAfterMaxRequestsCaptchaChannelProcessorTests.java
similarity index 100%
rename from captcha/src/test/java/org/springframework/security/captcha/TestOnceAfterMaxRequestsCaptchaChannelProcessorTests.java
rename to sandbox/captcha/src/test/java/org/springframework/security/captcha/TestOnceAfterMaxRequestsCaptchaChannelProcessorTests.java