diff --git a/src/clojure/contrib/accumulators.clj b/src/main/clojure/clojure/contrib/accumulators.clj
similarity index 100%
rename from src/clojure/contrib/accumulators.clj
rename to src/main/clojure/clojure/contrib/accumulators.clj
diff --git a/src/clojure/contrib/accumulators/examples.clj b/src/main/clojure/clojure/contrib/accumulators/examples.clj
similarity index 100%
rename from src/clojure/contrib/accumulators/examples.clj
rename to src/main/clojure/clojure/contrib/accumulators/examples.clj
diff --git a/src/clojure/contrib/agent_utils.clj b/src/main/clojure/clojure/contrib/agent_utils.clj
similarity index 100%
rename from src/clojure/contrib/agent_utils.clj
rename to src/main/clojure/clojure/contrib/agent_utils.clj
diff --git a/src/clojure/contrib/apply_macro.clj b/src/main/clojure/clojure/contrib/apply_macro.clj
similarity index 100%
rename from src/clojure/contrib/apply_macro.clj
rename to src/main/clojure/clojure/contrib/apply_macro.clj
diff --git a/src/clojure/contrib/base64.clj b/src/main/clojure/clojure/contrib/base64.clj
similarity index 100%
rename from src/clojure/contrib/base64.clj
rename to src/main/clojure/clojure/contrib/base64.clj
diff --git a/src/clojure/contrib/classpath.clj b/src/main/clojure/clojure/contrib/classpath.clj
similarity index 100%
rename from src/clojure/contrib/classpath.clj
rename to src/main/clojure/clojure/contrib/classpath.clj
diff --git a/src/clojure/contrib/combinatorics.clj b/src/main/clojure/clojure/contrib/combinatorics.clj
similarity index 100%
rename from src/clojure/contrib/combinatorics.clj
rename to src/main/clojure/clojure/contrib/combinatorics.clj
diff --git a/src/clojure/contrib/command_line.clj b/src/main/clojure/clojure/contrib/command_line.clj
similarity index 100%
rename from src/clojure/contrib/command_line.clj
rename to src/main/clojure/clojure/contrib/command_line.clj
diff --git a/src/clojure/contrib/complex_numbers.clj b/src/main/clojure/clojure/contrib/complex_numbers.clj
similarity index 100%
rename from src/clojure/contrib/complex_numbers.clj
rename to src/main/clojure/clojure/contrib/complex_numbers.clj
diff --git a/src/clojure/contrib/cond.clj b/src/main/clojure/clojure/contrib/cond.clj
similarity index 100%
rename from src/clojure/contrib/cond.clj
rename to src/main/clojure/clojure/contrib/cond.clj
diff --git a/src/clojure/contrib/condition.clj b/src/main/clojure/clojure/contrib/condition.clj
similarity index 100%
rename from src/clojure/contrib/condition.clj
rename to src/main/clojure/clojure/contrib/condition.clj
diff --git a/src/clojure/contrib/condition/Condition.clj b/src/main/clojure/clojure/contrib/condition/Condition.clj
similarity index 100%
rename from src/clojure/contrib/condition/Condition.clj
rename to src/main/clojure/clojure/contrib/condition/Condition.clj
diff --git a/src/clojure/contrib/condition/example.clj b/src/main/clojure/clojure/contrib/condition/example.clj
similarity index 100%
rename from src/clojure/contrib/condition/example.clj
rename to src/main/clojure/clojure/contrib/condition/example.clj
diff --git a/src/clojure/contrib/core.clj b/src/main/clojure/clojure/contrib/core.clj
similarity index 100%
rename from src/clojure/contrib/core.clj
rename to src/main/clojure/clojure/contrib/core.clj
diff --git a/src/clojure/contrib/dataflow.clj b/src/main/clojure/clojure/contrib/dataflow.clj
similarity index 100%
rename from src/clojure/contrib/dataflow.clj
rename to src/main/clojure/clojure/contrib/dataflow.clj
diff --git a/src/clojure/contrib/datalog.clj b/src/main/clojure/clojure/contrib/datalog.clj
similarity index 100%
rename from src/clojure/contrib/datalog.clj
rename to src/main/clojure/clojure/contrib/datalog.clj
diff --git a/src/clojure/contrib/datalog/database.clj b/src/main/clojure/clojure/contrib/datalog/database.clj
similarity index 100%
rename from src/clojure/contrib/datalog/database.clj
rename to src/main/clojure/clojure/contrib/datalog/database.clj
diff --git a/src/clojure/contrib/datalog/example.clj b/src/main/clojure/clojure/contrib/datalog/example.clj
similarity index 100%
rename from src/clojure/contrib/datalog/example.clj
rename to src/main/clojure/clojure/contrib/datalog/example.clj
diff --git a/src/clojure/contrib/datalog/literals.clj b/src/main/clojure/clojure/contrib/datalog/literals.clj
similarity index 100%
rename from src/clojure/contrib/datalog/literals.clj
rename to src/main/clojure/clojure/contrib/datalog/literals.clj
diff --git a/src/clojure/contrib/datalog/magic.clj b/src/main/clojure/clojure/contrib/datalog/magic.clj
similarity index 100%
rename from src/clojure/contrib/datalog/magic.clj
rename to src/main/clojure/clojure/contrib/datalog/magic.clj
diff --git a/src/clojure/contrib/datalog/rules.clj b/src/main/clojure/clojure/contrib/datalog/rules.clj
similarity index 100%
rename from src/clojure/contrib/datalog/rules.clj
rename to src/main/clojure/clojure/contrib/datalog/rules.clj
diff --git a/src/clojure/contrib/datalog/softstrat.clj b/src/main/clojure/clojure/contrib/datalog/softstrat.clj
similarity index 100%
rename from src/clojure/contrib/datalog/softstrat.clj
rename to src/main/clojure/clojure/contrib/datalog/softstrat.clj
diff --git a/src/clojure/contrib/datalog/util.clj b/src/main/clojure/clojure/contrib/datalog/util.clj
similarity index 100%
rename from src/clojure/contrib/datalog/util.clj
rename to src/main/clojure/clojure/contrib/datalog/util.clj
diff --git a/src/clojure/contrib/def.clj b/src/main/clojure/clojure/contrib/def.clj
similarity index 100%
rename from src/clojure/contrib/def.clj
rename to src/main/clojure/clojure/contrib/def.clj
diff --git a/src/clojure/contrib/duck_streams.clj b/src/main/clojure/clojure/contrib/duck_streams.clj
similarity index 100%
rename from src/clojure/contrib/duck_streams.clj
rename to src/main/clojure/clojure/contrib/duck_streams.clj
diff --git a/src/clojure/contrib/error_kit.clj b/src/main/clojure/clojure/contrib/error_kit.clj
similarity index 100%
rename from src/clojure/contrib/error_kit.clj
rename to src/main/clojure/clojure/contrib/error_kit.clj
diff --git a/src/clojure/contrib/except.clj b/src/main/clojure/clojure/contrib/except.clj
similarity index 100%
rename from src/clojure/contrib/except.clj
rename to src/main/clojure/clojure/contrib/except.clj
diff --git a/src/clojure/contrib/fcase.clj b/src/main/clojure/clojure/contrib/fcase.clj
similarity index 100%
rename from src/clojure/contrib/fcase.clj
rename to src/main/clojure/clojure/contrib/fcase.clj
diff --git a/src/clojure/contrib/find_namespaces.clj b/src/main/clojure/clojure/contrib/find_namespaces.clj
similarity index 100%
rename from src/clojure/contrib/find_namespaces.clj
rename to src/main/clojure/clojure/contrib/find_namespaces.clj
diff --git a/src/clojure/contrib/fnmap.clj b/src/main/clojure/clojure/contrib/fnmap.clj
similarity index 100%
rename from src/clojure/contrib/fnmap.clj
rename to src/main/clojure/clojure/contrib/fnmap.clj
diff --git a/src/clojure/contrib/fnmap/PersistentFnMap.clj b/src/main/clojure/clojure/contrib/fnmap/PersistentFnMap.clj
similarity index 100%
rename from src/clojure/contrib/fnmap/PersistentFnMap.clj
rename to src/main/clojure/clojure/contrib/fnmap/PersistentFnMap.clj
diff --git a/src/clojure/contrib/gen_html_docs.clj b/src/main/clojure/clojure/contrib/gen_html_docs.clj
similarity index 100%
rename from src/clojure/contrib/gen_html_docs.clj
rename to src/main/clojure/clojure/contrib/gen_html_docs.clj
diff --git a/src/clojure/contrib/generic.clj b/src/main/clojure/clojure/contrib/generic.clj
similarity index 100%
rename from src/clojure/contrib/generic.clj
rename to src/main/clojure/clojure/contrib/generic.clj
diff --git a/src/clojure/contrib/generic/arithmetic.clj b/src/main/clojure/clojure/contrib/generic/arithmetic.clj
similarity index 100%
rename from src/clojure/contrib/generic/arithmetic.clj
rename to src/main/clojure/clojure/contrib/generic/arithmetic.clj
diff --git a/src/clojure/contrib/generic/collection.clj b/src/main/clojure/clojure/contrib/generic/collection.clj
similarity index 100%
rename from src/clojure/contrib/generic/collection.clj
rename to src/main/clojure/clojure/contrib/generic/collection.clj
diff --git a/src/clojure/contrib/generic/comparison.clj b/src/main/clojure/clojure/contrib/generic/comparison.clj
similarity index 100%
rename from src/clojure/contrib/generic/comparison.clj
rename to src/main/clojure/clojure/contrib/generic/comparison.clj
diff --git a/src/clojure/contrib/generic/functor.clj b/src/main/clojure/clojure/contrib/generic/functor.clj
similarity index 100%
rename from src/clojure/contrib/generic/functor.clj
rename to src/main/clojure/clojure/contrib/generic/functor.clj
diff --git a/src/clojure/contrib/generic/math_functions.clj b/src/main/clojure/clojure/contrib/generic/math_functions.clj
similarity index 100%
rename from src/clojure/contrib/generic/math_functions.clj
rename to src/main/clojure/clojure/contrib/generic/math_functions.clj
diff --git a/src/clojure/contrib/graph.clj b/src/main/clojure/clojure/contrib/graph.clj
similarity index 100%
rename from src/clojure/contrib/graph.clj
rename to src/main/clojure/clojure/contrib/graph.clj
diff --git a/src/clojure/contrib/greatest_least.clj b/src/main/clojure/clojure/contrib/greatest_least.clj
similarity index 100%
rename from src/clojure/contrib/greatest_least.clj
rename to src/main/clojure/clojure/contrib/greatest_least.clj
diff --git a/src/clojure/contrib/http/agent.clj b/src/main/clojure/clojure/contrib/http/agent.clj
similarity index 100%
rename from src/clojure/contrib/http/agent.clj
rename to src/main/clojure/clojure/contrib/http/agent.clj
diff --git a/src/clojure/contrib/http/connection.clj b/src/main/clojure/clojure/contrib/http/connection.clj
similarity index 100%
rename from src/clojure/contrib/http/connection.clj
rename to src/main/clojure/clojure/contrib/http/connection.clj
diff --git a/src/clojure/contrib/import_static.clj b/src/main/clojure/clojure/contrib/import_static.clj
similarity index 100%
rename from src/clojure/contrib/import_static.clj
rename to src/main/clojure/clojure/contrib/import_static.clj
diff --git a/src/clojure/contrib/jar.clj b/src/main/clojure/clojure/contrib/jar.clj
similarity index 100%
rename from src/clojure/contrib/jar.clj
rename to src/main/clojure/clojure/contrib/jar.clj
diff --git a/src/clojure/contrib/java_utils.clj b/src/main/clojure/clojure/contrib/java_utils.clj
similarity index 100%
rename from src/clojure/contrib/java_utils.clj
rename to src/main/clojure/clojure/contrib/java_utils.clj
diff --git a/src/clojure/contrib/javadoc.clj b/src/main/clojure/clojure/contrib/javadoc.clj
similarity index 100%
rename from src/clojure/contrib/javadoc.clj
rename to src/main/clojure/clojure/contrib/javadoc.clj
diff --git a/src/clojure/contrib/javadoc/browse.clj b/src/main/clojure/clojure/contrib/javadoc/browse.clj
similarity index 100%
rename from src/clojure/contrib/javadoc/browse.clj
rename to src/main/clojure/clojure/contrib/javadoc/browse.clj
diff --git a/src/clojure/contrib/javadoc/browse_ui.clj b/src/main/clojure/clojure/contrib/javadoc/browse_ui.clj
similarity index 100%
rename from src/clojure/contrib/javadoc/browse_ui.clj
rename to src/main/clojure/clojure/contrib/javadoc/browse_ui.clj
diff --git a/src/clojure/contrib/jmx.clj b/src/main/clojure/clojure/contrib/jmx.clj
similarity index 100%
rename from src/clojure/contrib/jmx.clj
rename to src/main/clojure/clojure/contrib/jmx.clj
diff --git a/src/clojure/contrib/jmx/Bean.clj b/src/main/clojure/clojure/contrib/jmx/Bean.clj
similarity index 100%
rename from src/clojure/contrib/jmx/Bean.clj
rename to src/main/clojure/clojure/contrib/jmx/Bean.clj
diff --git a/src/clojure/contrib/jmx/client.clj b/src/main/clojure/clojure/contrib/jmx/client.clj
similarity index 100%
rename from src/clojure/contrib/jmx/client.clj
rename to src/main/clojure/clojure/contrib/jmx/client.clj
diff --git a/src/clojure/contrib/jmx/data.clj b/src/main/clojure/clojure/contrib/jmx/data.clj
similarity index 100%
rename from src/clojure/contrib/jmx/data.clj
rename to src/main/clojure/clojure/contrib/jmx/data.clj
diff --git a/src/clojure/contrib/jmx/server.clj b/src/main/clojure/clojure/contrib/jmx/server.clj
similarity index 100%
rename from src/clojure/contrib/jmx/server.clj
rename to src/main/clojure/clojure/contrib/jmx/server.clj
diff --git a/src/clojure/contrib/json/read.clj b/src/main/clojure/clojure/contrib/json/read.clj
similarity index 100%
rename from src/clojure/contrib/json/read.clj
rename to src/main/clojure/clojure/contrib/json/read.clj
diff --git a/src/clojure/contrib/json/write.clj b/src/main/clojure/clojure/contrib/json/write.clj
similarity index 100%
rename from src/clojure/contrib/json/write.clj
rename to src/main/clojure/clojure/contrib/json/write.clj
diff --git a/src/clojure/contrib/lazy_seqs.clj b/src/main/clojure/clojure/contrib/lazy_seqs.clj
similarity index 100%
rename from src/clojure/contrib/lazy_seqs.clj
rename to src/main/clojure/clojure/contrib/lazy_seqs.clj
diff --git a/src/clojure/contrib/lazy_xml.clj b/src/main/clojure/clojure/contrib/lazy_xml.clj
similarity index 100%
rename from src/clojure/contrib/lazy_xml.clj
rename to src/main/clojure/clojure/contrib/lazy_xml.clj
diff --git a/src/clojure/contrib/lazy_xml/with_pull.clj b/src/main/clojure/clojure/contrib/lazy_xml/with_pull.clj
similarity index 100%
rename from src/clojure/contrib/lazy_xml/with_pull.clj
rename to src/main/clojure/clojure/contrib/lazy_xml/with_pull.clj
diff --git a/src/clojure/contrib/load_all.clj b/src/main/clojure/clojure/contrib/load_all.clj
similarity index 100%
rename from src/clojure/contrib/load_all.clj
rename to src/main/clojure/clojure/contrib/load_all.clj
diff --git a/src/clojure/contrib/logging.clj b/src/main/clojure/clojure/contrib/logging.clj
similarity index 100%
rename from src/clojure/contrib/logging.clj
rename to src/main/clojure/clojure/contrib/logging.clj
diff --git a/src/clojure/contrib/macro_utils.clj b/src/main/clojure/clojure/contrib/macro_utils.clj
similarity index 100%
rename from src/clojure/contrib/macro_utils.clj
rename to src/main/clojure/clojure/contrib/macro_utils.clj
diff --git a/src/clojure/contrib/macros.clj b/src/main/clojure/clojure/contrib/macros.clj
similarity index 100%
rename from src/clojure/contrib/macros.clj
rename to src/main/clojure/clojure/contrib/macros.clj
diff --git a/src/clojure/contrib/map_utils.clj b/src/main/clojure/clojure/contrib/map_utils.clj
similarity index 100%
rename from src/clojure/contrib/map_utils.clj
rename to src/main/clojure/clojure/contrib/map_utils.clj
diff --git a/src/clojure/contrib/math.clj b/src/main/clojure/clojure/contrib/math.clj
similarity index 100%
rename from src/clojure/contrib/math.clj
rename to src/main/clojure/clojure/contrib/math.clj
diff --git a/src/clojure/contrib/miglayout.clj b/src/main/clojure/clojure/contrib/miglayout.clj
similarity index 100%
rename from src/clojure/contrib/miglayout.clj
rename to src/main/clojure/clojure/contrib/miglayout.clj
diff --git a/src/clojure/contrib/miglayout/example.clj b/src/main/clojure/clojure/contrib/miglayout/example.clj
similarity index 100%
rename from src/clojure/contrib/miglayout/example.clj
rename to src/main/clojure/clojure/contrib/miglayout/example.clj
diff --git a/src/clojure/contrib/miglayout/internal.clj b/src/main/clojure/clojure/contrib/miglayout/internal.clj
similarity index 100%
rename from src/clojure/contrib/miglayout/internal.clj
rename to src/main/clojure/clojure/contrib/miglayout/internal.clj
diff --git a/src/clojure/contrib/mmap.clj b/src/main/clojure/clojure/contrib/mmap.clj
similarity index 100%
rename from src/clojure/contrib/mmap.clj
rename to src/main/clojure/clojure/contrib/mmap.clj
diff --git a/src/clojure/contrib/mock.clj b/src/main/clojure/clojure/contrib/mock.clj
similarity index 100%
rename from src/clojure/contrib/mock.clj
rename to src/main/clojure/clojure/contrib/mock.clj
diff --git a/src/clojure/contrib/mock/test_adapter.clj b/src/main/clojure/clojure/contrib/mock/test_adapter.clj
similarity index 100%
rename from src/clojure/contrib/mock/test_adapter.clj
rename to src/main/clojure/clojure/contrib/mock/test_adapter.clj
diff --git a/src/clojure/contrib/monadic_io_streams.clj b/src/main/clojure/clojure/contrib/monadic_io_streams.clj
similarity index 100%
rename from src/clojure/contrib/monadic_io_streams.clj
rename to src/main/clojure/clojure/contrib/monadic_io_streams.clj
diff --git a/src/clojure/contrib/monads.clj b/src/main/clojure/clojure/contrib/monads.clj
similarity index 100%
rename from src/clojure/contrib/monads.clj
rename to src/main/clojure/clojure/contrib/monads.clj
diff --git a/src/clojure/contrib/monads/examples.clj b/src/main/clojure/clojure/contrib/monads/examples.clj
similarity index 100%
rename from src/clojure/contrib/monads/examples.clj
rename to src/main/clojure/clojure/contrib/monads/examples.clj
diff --git a/src/clojure/contrib/ns_utils.clj b/src/main/clojure/clojure/contrib/ns_utils.clj
similarity index 100%
rename from src/clojure/contrib/ns_utils.clj
rename to src/main/clojure/clojure/contrib/ns_utils.clj
diff --git a/src/clojure/contrib/pprint.clj b/src/main/clojure/clojure/contrib/pprint.clj
similarity index 100%
rename from src/clojure/contrib/pprint.clj
rename to src/main/clojure/clojure/contrib/pprint.clj
diff --git a/src/clojure/contrib/pprint/ColumnWriter.clj b/src/main/clojure/clojure/contrib/pprint/ColumnWriter.clj
similarity index 100%
rename from src/clojure/contrib/pprint/ColumnWriter.clj
rename to src/main/clojure/clojure/contrib/pprint/ColumnWriter.clj
diff --git a/src/clojure/contrib/pprint/PrettyWriter.clj b/src/main/clojure/clojure/contrib/pprint/PrettyWriter.clj
similarity index 100%
rename from src/clojure/contrib/pprint/PrettyWriter.clj
rename to src/main/clojure/clojure/contrib/pprint/PrettyWriter.clj
diff --git a/src/clojure/contrib/pprint/cl_format.clj b/src/main/clojure/clojure/contrib/pprint/cl_format.clj
similarity index 100%
rename from src/clojure/contrib/pprint/cl_format.clj
rename to src/main/clojure/clojure/contrib/pprint/cl_format.clj
diff --git a/src/clojure/contrib/pprint/dispatch.clj b/src/main/clojure/clojure/contrib/pprint/dispatch.clj
similarity index 100%
rename from src/clojure/contrib/pprint/dispatch.clj
rename to src/main/clojure/clojure/contrib/pprint/dispatch.clj
diff --git a/src/clojure/contrib/pprint/examples/hexdump.clj b/src/main/clojure/clojure/contrib/pprint/examples/hexdump.clj
similarity index 100%
rename from src/clojure/contrib/pprint/examples/hexdump.clj
rename to src/main/clojure/clojure/contrib/pprint/examples/hexdump.clj
diff --git a/src/clojure/contrib/pprint/examples/json.clj b/src/main/clojure/clojure/contrib/pprint/examples/json.clj
similarity index 100%
rename from src/clojure/contrib/pprint/examples/json.clj
rename to src/main/clojure/clojure/contrib/pprint/examples/json.clj
diff --git a/src/clojure/contrib/pprint/examples/multiply.clj b/src/main/clojure/clojure/contrib/pprint/examples/multiply.clj
similarity index 100%
rename from src/clojure/contrib/pprint/examples/multiply.clj
rename to src/main/clojure/clojure/contrib/pprint/examples/multiply.clj
diff --git a/src/clojure/contrib/pprint/examples/props.clj b/src/main/clojure/clojure/contrib/pprint/examples/props.clj
similarity index 100%
rename from src/clojure/contrib/pprint/examples/props.clj
rename to src/main/clojure/clojure/contrib/pprint/examples/props.clj
diff --git a/src/clojure/contrib/pprint/examples/show_doc.clj b/src/main/clojure/clojure/contrib/pprint/examples/show_doc.clj
similarity index 100%
rename from src/clojure/contrib/pprint/examples/show_doc.clj
rename to src/main/clojure/clojure/contrib/pprint/examples/show_doc.clj
diff --git a/src/clojure/contrib/pprint/examples/xml.clj b/src/main/clojure/clojure/contrib/pprint/examples/xml.clj
similarity index 100%
rename from src/clojure/contrib/pprint/examples/xml.clj
rename to src/main/clojure/clojure/contrib/pprint/examples/xml.clj
diff --git a/src/clojure/contrib/pprint/pprint_base.clj b/src/main/clojure/clojure/contrib/pprint/pprint_base.clj
similarity index 100%
rename from src/clojure/contrib/pprint/pprint_base.clj
rename to src/main/clojure/clojure/contrib/pprint/pprint_base.clj
diff --git a/src/clojure/contrib/pprint/utilities.clj b/src/main/clojure/clojure/contrib/pprint/utilities.clj
similarity index 100%
rename from src/clojure/contrib/pprint/utilities.clj
rename to src/main/clojure/clojure/contrib/pprint/utilities.clj
diff --git a/src/clojure/contrib/probabilities/examples_finite_distributions.clj b/src/main/clojure/clojure/contrib/probabilities/examples_finite_distributions.clj
similarity index 100%
rename from src/clojure/contrib/probabilities/examples_finite_distributions.clj
rename to src/main/clojure/clojure/contrib/probabilities/examples_finite_distributions.clj
diff --git a/src/clojure/contrib/probabilities/examples_monte_carlo.clj b/src/main/clojure/clojure/contrib/probabilities/examples_monte_carlo.clj
similarity index 100%
rename from src/clojure/contrib/probabilities/examples_monte_carlo.clj
rename to src/main/clojure/clojure/contrib/probabilities/examples_monte_carlo.clj
diff --git a/src/clojure/contrib/probabilities/finite_distributions.clj b/src/main/clojure/clojure/contrib/probabilities/finite_distributions.clj
similarity index 100%
rename from src/clojure/contrib/probabilities/finite_distributions.clj
rename to src/main/clojure/clojure/contrib/probabilities/finite_distributions.clj
diff --git a/src/clojure/contrib/probabilities/monte_carlo.clj b/src/main/clojure/clojure/contrib/probabilities/monte_carlo.clj
similarity index 100%
rename from src/clojure/contrib/probabilities/monte_carlo.clj
rename to src/main/clojure/clojure/contrib/probabilities/monte_carlo.clj
diff --git a/src/clojure/contrib/probabilities/random_numbers.clj b/src/main/clojure/clojure/contrib/probabilities/random_numbers.clj
similarity index 100%
rename from src/clojure/contrib/probabilities/random_numbers.clj
rename to src/main/clojure/clojure/contrib/probabilities/random_numbers.clj
diff --git a/src/clojure/contrib/profile.clj b/src/main/clojure/clojure/contrib/profile.clj
similarity index 100%
rename from src/clojure/contrib/profile.clj
rename to src/main/clojure/clojure/contrib/profile.clj
diff --git a/src/clojure/contrib/prxml.clj b/src/main/clojure/clojure/contrib/prxml.clj
similarity index 100%
rename from src/clojure/contrib/prxml.clj
rename to src/main/clojure/clojure/contrib/prxml.clj
diff --git a/src/clojure/contrib/repl_ln.clj b/src/main/clojure/clojure/contrib/repl_ln.clj
similarity index 100%
rename from src/clojure/contrib/repl_ln.clj
rename to src/main/clojure/clojure/contrib/repl_ln.clj
diff --git a/src/clojure/contrib/repl_utils.clj b/src/main/clojure/clojure/contrib/repl_utils.clj
similarity index 100%
rename from src/clojure/contrib/repl_utils.clj
rename to src/main/clojure/clojure/contrib/repl_utils.clj
diff --git a/src/clojure/contrib/repl_utils/javadoc.clj b/src/main/clojure/clojure/contrib/repl_utils/javadoc.clj
similarity index 100%
rename from src/clojure/contrib/repl_utils/javadoc.clj
rename to src/main/clojure/clojure/contrib/repl_utils/javadoc.clj
diff --git a/src/clojure/contrib/seq_utils.clj b/src/main/clojure/clojure/contrib/seq_utils.clj
similarity index 100%
rename from src/clojure/contrib/seq_utils.clj
rename to src/main/clojure/clojure/contrib/seq_utils.clj
diff --git a/src/clojure/contrib/server_socket.clj b/src/main/clojure/clojure/contrib/server_socket.clj
similarity index 100%
rename from src/clojure/contrib/server_socket.clj
rename to src/main/clojure/clojure/contrib/server_socket.clj
diff --git a/src/clojure/contrib/set.clj b/src/main/clojure/clojure/contrib/set.clj
similarity index 100%
rename from src/clojure/contrib/set.clj
rename to src/main/clojure/clojure/contrib/set.clj
diff --git a/src/clojure/contrib/shell_out.clj b/src/main/clojure/clojure/contrib/shell_out.clj
similarity index 100%
rename from src/clojure/contrib/shell_out.clj
rename to src/main/clojure/clojure/contrib/shell_out.clj
diff --git a/src/clojure/contrib/singleton.clj b/src/main/clojure/clojure/contrib/singleton.clj
similarity index 100%
rename from src/clojure/contrib/singleton.clj
rename to src/main/clojure/clojure/contrib/singleton.clj
diff --git a/src/clojure/contrib/sql.clj b/src/main/clojure/clojure/contrib/sql.clj
similarity index 100%
rename from src/clojure/contrib/sql.clj
rename to src/main/clojure/clojure/contrib/sql.clj
diff --git a/src/clojure/contrib/sql/internal.clj b/src/main/clojure/clojure/contrib/sql/internal.clj
similarity index 100%
rename from src/clojure/contrib/sql/internal.clj
rename to src/main/clojure/clojure/contrib/sql/internal.clj
diff --git a/src/clojure/contrib/str_utils.clj b/src/main/clojure/clojure/contrib/str_utils.clj
similarity index 100%
rename from src/clojure/contrib/str_utils.clj
rename to src/main/clojure/clojure/contrib/str_utils.clj
diff --git a/src/clojure/contrib/str_utils2.clj b/src/main/clojure/clojure/contrib/str_utils2.clj
similarity index 100%
rename from src/clojure/contrib/str_utils2.clj
rename to src/main/clojure/clojure/contrib/str_utils2.clj
diff --git a/src/clojure/contrib/stream_utils.clj b/src/main/clojure/clojure/contrib/stream_utils.clj
similarity index 100%
rename from src/clojure/contrib/stream_utils.clj
rename to src/main/clojure/clojure/contrib/stream_utils.clj
diff --git a/src/clojure/contrib/stream_utils/examples.clj b/src/main/clojure/clojure/contrib/stream_utils/examples.clj
similarity index 100%
rename from src/clojure/contrib/stream_utils/examples.clj
rename to src/main/clojure/clojure/contrib/stream_utils/examples.clj
diff --git a/src/clojure/contrib/swing_utils.clj b/src/main/clojure/clojure/contrib/swing_utils.clj
similarity index 100%
rename from src/clojure/contrib/swing_utils.clj
rename to src/main/clojure/clojure/contrib/swing_utils.clj
diff --git a/src/clojure/contrib/test_is.clj b/src/main/clojure/clojure/contrib/test_is.clj
similarity index 100%
rename from src/clojure/contrib/test_is.clj
rename to src/main/clojure/clojure/contrib/test_is.clj
diff --git a/src/clojure/contrib/trace.clj b/src/main/clojure/clojure/contrib/trace.clj
similarity index 100%
rename from src/clojure/contrib/trace.clj
rename to src/main/clojure/clojure/contrib/trace.clj
diff --git a/src/clojure/contrib/types.clj b/src/main/clojure/clojure/contrib/types.clj
similarity index 100%
rename from src/clojure/contrib/types.clj
rename to src/main/clojure/clojure/contrib/types.clj
diff --git a/src/clojure/contrib/types/examples.clj b/src/main/clojure/clojure/contrib/types/examples.clj
similarity index 100%
rename from src/clojure/contrib/types/examples.clj
rename to src/main/clojure/clojure/contrib/types/examples.clj
diff --git a/src/clojure/contrib/with_ns.clj b/src/main/clojure/clojure/contrib/with_ns.clj
similarity index 100%
rename from src/clojure/contrib/with_ns.clj
rename to src/main/clojure/clojure/contrib/with_ns.clj
diff --git a/src/clojure/contrib/zip_filter.clj b/src/main/clojure/clojure/contrib/zip_filter.clj
similarity index 100%
rename from src/clojure/contrib/zip_filter.clj
rename to src/main/clojure/clojure/contrib/zip_filter.clj
diff --git a/src/clojure/contrib/zip_filter/xml.clj b/src/main/clojure/clojure/contrib/zip_filter/xml.clj
similarity index 100%
rename from src/clojure/contrib/zip_filter/xml.clj
rename to src/main/clojure/clojure/contrib/zip_filter/xml.clj
diff --git a/src/clojure/contrib/core/tests.clj b/src/test/clojure/clojure/contrib/core/tests.clj
similarity index 100%
rename from src/clojure/contrib/core/tests.clj
rename to src/test/clojure/clojure/contrib/core/tests.clj
diff --git a/src/clojure/contrib/datalog/tests/test.clj b/src/test/clojure/clojure/contrib/datalog/tests/test.clj
similarity index 100%
rename from src/clojure/contrib/datalog/tests/test.clj
rename to src/test/clojure/clojure/contrib/datalog/tests/test.clj
diff --git a/src/clojure/contrib/datalog/tests/test_database.clj b/src/test/clojure/clojure/contrib/datalog/tests/test_database.clj
similarity index 100%
rename from src/clojure/contrib/datalog/tests/test_database.clj
rename to src/test/clojure/clojure/contrib/datalog/tests/test_database.clj
diff --git a/src/clojure/contrib/datalog/tests/test_literals.clj b/src/test/clojure/clojure/contrib/datalog/tests/test_literals.clj
similarity index 100%
rename from src/clojure/contrib/datalog/tests/test_literals.clj
rename to src/test/clojure/clojure/contrib/datalog/tests/test_literals.clj
diff --git a/src/clojure/contrib/datalog/tests/test_magic.clj b/src/test/clojure/clojure/contrib/datalog/tests/test_magic.clj
similarity index 100%
rename from src/clojure/contrib/datalog/tests/test_magic.clj
rename to src/test/clojure/clojure/contrib/datalog/tests/test_magic.clj
diff --git a/src/clojure/contrib/datalog/tests/test_rules.clj b/src/test/clojure/clojure/contrib/datalog/tests/test_rules.clj
similarity index 100%
rename from src/clojure/contrib/datalog/tests/test_rules.clj
rename to src/test/clojure/clojure/contrib/datalog/tests/test_rules.clj
diff --git a/src/clojure/contrib/datalog/tests/test_softstrat.clj b/src/test/clojure/clojure/contrib/datalog/tests/test_softstrat.clj
similarity index 100%
rename from src/clojure/contrib/datalog/tests/test_softstrat.clj
rename to src/test/clojure/clojure/contrib/datalog/tests/test_softstrat.clj
diff --git a/src/clojure/contrib/datalog/tests/test_util.clj b/src/test/clojure/clojure/contrib/datalog/tests/test_util.clj
similarity index 100%
rename from src/clojure/contrib/datalog/tests/test_util.clj
rename to src/test/clojure/clojure/contrib/datalog/tests/test_util.clj
diff --git a/src/clojure/contrib/math/tests.clj b/src/test/clojure/clojure/contrib/math/tests.clj
similarity index 100%
rename from src/clojure/contrib/math/tests.clj
rename to src/test/clojure/clojure/contrib/math/tests.clj
diff --git a/src/clojure/contrib/miglayout/test.clj b/src/test/clojure/clojure/contrib/miglayout/test.clj
similarity index 100%
rename from src/clojure/contrib/miglayout/test.clj
rename to src/test/clojure/clojure/contrib/miglayout/test.clj
diff --git a/src/clojure/contrib/sql/test.clj b/src/test/clojure/clojure/contrib/sql/test.clj
similarity index 100%
rename from src/clojure/contrib/sql/test.clj
rename to src/test/clojure/clojure/contrib/sql/test.clj
diff --git a/src/clojure/contrib/test_contrib.clj b/src/test/clojure/clojure/contrib/test_contrib.clj
similarity index 100%
rename from src/clojure/contrib/test_contrib.clj
rename to src/test/clojure/clojure/contrib/test_contrib.clj
diff --git a/src/clojure/contrib/test_contrib/complex_numbers.clj b/src/test/clojure/clojure/contrib/test_contrib/complex_numbers.clj
similarity index 100%
rename from src/clojure/contrib/test_contrib/complex_numbers.clj
rename to src/test/clojure/clojure/contrib/test_contrib/complex_numbers.clj
diff --git a/src/clojure/contrib/test_contrib/fnmap.clj b/src/test/clojure/clojure/contrib/test_contrib/fnmap.clj
similarity index 100%
rename from src/clojure/contrib/test_contrib/fnmap.clj
rename to src/test/clojure/clojure/contrib/test_contrib/fnmap.clj
diff --git a/src/clojure/contrib/test_contrib/greatest_least.clj b/src/test/clojure/clojure/contrib/test_contrib/greatest_least.clj
similarity index 100%
rename from src/clojure/contrib/test_contrib/greatest_least.clj
rename to src/test/clojure/clojure/contrib/test_contrib/greatest_least.clj
diff --git a/src/clojure/contrib/test_contrib/java_utils.clj b/src/test/clojure/clojure/contrib/test_contrib/java_utils.clj
similarity index 100%
rename from src/clojure/contrib/test_contrib/java_utils.clj
rename to src/test/clojure/clojure/contrib/test_contrib/java_utils.clj
diff --git a/src/clojure/contrib/test_contrib/macro_utils.clj b/src/test/clojure/clojure/contrib/test_contrib/macro_utils.clj
similarity index 100%
rename from src/clojure/contrib/test_contrib/macro_utils.clj
rename to src/test/clojure/clojure/contrib/test_contrib/macro_utils.clj
diff --git a/src/clojure/contrib/test_contrib/mock_test.clj b/src/test/clojure/clojure/contrib/test_contrib/mock_test.clj
similarity index 100%
rename from src/clojure/contrib/test_contrib/mock_test.clj
rename to src/test/clojure/clojure/contrib/test_contrib/mock_test.clj
diff --git a/src/clojure/contrib/test_contrib/mock_test/test_adapter_test.clj b/src/test/clojure/clojure/contrib/test_contrib/mock_test/test_adapter_test.clj
similarity index 100%
rename from src/clojure/contrib/test_contrib/mock_test/test_adapter_test.clj
rename to src/test/clojure/clojure/contrib/test_contrib/mock_test/test_adapter_test.clj
diff --git a/src/clojure/contrib/test_contrib/monads.clj b/src/test/clojure/clojure/contrib/test_contrib/monads.clj
similarity index 100%
rename from src/clojure/contrib/test_contrib/monads.clj
rename to src/test/clojure/clojure/contrib/test_contrib/monads.clj
diff --git a/src/clojure/contrib/test_contrib/pprint/cl_format.clj b/src/test/clojure/clojure/contrib/test_contrib/pprint/cl_format.clj
similarity index 100%
rename from src/clojure/contrib/test_contrib/pprint/cl_format.clj
rename to src/test/clojure/clojure/contrib/test_contrib/pprint/cl_format.clj
diff --git a/src/clojure/contrib/test_contrib/pprint/helper.clj b/src/test/clojure/clojure/contrib/test_contrib/pprint/helper.clj
similarity index 100%
rename from src/clojure/contrib/test_contrib/pprint/helper.clj
rename to src/test/clojure/clojure/contrib/test_contrib/pprint/helper.clj
diff --git a/src/clojure/contrib/test_contrib/pprint/pretty.clj b/src/test/clojure/clojure/contrib/test_contrib/pprint/pretty.clj
similarity index 100%
rename from src/clojure/contrib/test_contrib/pprint/pretty.clj
rename to src/test/clojure/clojure/contrib/test_contrib/pprint/pretty.clj
diff --git a/src/clojure/contrib/test_contrib/seq_utils_test.clj b/src/test/clojure/clojure/contrib/test_contrib/seq_utils_test.clj
similarity index 100%
rename from src/clojure/contrib/test_contrib/seq_utils_test.clj
rename to src/test/clojure/clojure/contrib/test_contrib/seq_utils_test.clj
diff --git a/src/clojure/contrib/test_contrib/shell_out.clj b/src/test/clojure/clojure/contrib/test_contrib/shell_out.clj
similarity index 100%
rename from src/clojure/contrib/test_contrib/shell_out.clj
rename to src/test/clojure/clojure/contrib/test_contrib/shell_out.clj
diff --git a/src/clojure/contrib/test_contrib/str_utils.clj b/src/test/clojure/clojure/contrib/test_contrib/str_utils.clj
similarity index 100%
rename from src/clojure/contrib/test_contrib/str_utils.clj
rename to src/test/clojure/clojure/contrib/test_contrib/str_utils.clj
diff --git a/src/clojure/contrib/test_contrib/str_utils2.clj b/src/test/clojure/clojure/contrib/test_contrib/str_utils2.clj
similarity index 100%
rename from src/clojure/contrib/test_contrib/str_utils2.clj
rename to src/test/clojure/clojure/contrib/test_contrib/str_utils2.clj
diff --git a/src/clojure/contrib/test_contrib/test_dataflow.clj b/src/test/clojure/clojure/contrib/test_contrib/test_dataflow.clj
similarity index 100%
rename from src/clojure/contrib/test_contrib/test_dataflow.clj
rename to src/test/clojure/clojure/contrib/test_contrib/test_dataflow.clj
diff --git a/src/clojure/contrib/test_contrib/test_graph.clj b/src/test/clojure/clojure/contrib/test_contrib/test_graph.clj
similarity index 100%
rename from src/clojure/contrib/test_contrib/test_graph.clj
rename to src/test/clojure/clojure/contrib/test_contrib/test_graph.clj
diff --git a/src/clojure/contrib/test_contrib/test_java_utils.clj b/src/test/clojure/clojure/contrib/test_contrib/test_java_utils.clj
similarity index 100%
rename from src/clojure/contrib/test_contrib/test_java_utils.clj
rename to src/test/clojure/clojure/contrib/test_contrib/test_java_utils.clj
diff --git a/src/clojure/contrib/test_contrib/test_jmx.clj b/src/test/clojure/clojure/contrib/test_contrib/test_jmx.clj
similarity index 100%
rename from src/clojure/contrib/test_contrib/test_jmx.clj
rename to src/test/clojure/clojure/contrib/test_contrib/test_jmx.clj
diff --git a/src/clojure/contrib/test_contrib/test_lazy_seqs.clj b/src/test/clojure/clojure/contrib/test_contrib/test_lazy_seqs.clj
similarity index 100%
rename from src/clojure/contrib/test_contrib/test_lazy_seqs.clj
rename to src/test/clojure/clojure/contrib/test_contrib/test_lazy_seqs.clj
diff --git a/src/clojure/contrib/test_contrib/test_trace.clj b/src/test/clojure/clojure/contrib/test_contrib/test_trace.clj
similarity index 100%
rename from src/clojure/contrib/test_contrib/test_trace.clj
rename to src/test/clojure/clojure/contrib/test_contrib/test_trace.clj
diff --git a/src/clojure/contrib/test_contrib/walk.clj b/src/test/clojure/clojure/contrib/test_contrib/walk.clj
similarity index 100%
rename from src/clojure/contrib/test_contrib/walk.clj
rename to src/test/clojure/clojure/contrib/test_contrib/walk.clj
diff --git a/src/clojure/contrib/test_contrib/with_ns_test.clj b/src/test/clojure/clojure/contrib/test_contrib/with_ns_test.clj
similarity index 100%
rename from src/clojure/contrib/test_contrib/with_ns_test.clj
rename to src/test/clojure/clojure/contrib/test_contrib/with_ns_test.clj