From 3f0571b150c9c479d37eb1bb4e6e03428e025586 Mon Sep 17 00:00:00 2001 From: Matthew Swift <matthew.swift@forgerock.com> Date: Tue, 26 Nov 2013 17:41:45 +0000 Subject: [PATCH] Rename opendj3 directory to opendj. --- opendj-sdk/opendj-core/src/main/resources/org/forgerock/opendj/ldif/first.names | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnbindRequest.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequestImpl.java | 0 opendj-sdk/src/main/docbkx/dev-guide/images/data-organization.png | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableSearchResultReferenceImpl.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/LDAPTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityResponseControl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiredResponseControl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableDigestMD5SASLBindRequestImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequestImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionFactoryImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ResultImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java | 0 opendj-sdk/opendj-core/src/main/resources/org/forgerock/opendj/ldif/cities | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connection.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindClientImpl.java | 0 opendj-sdk/src/main/docbkx/shared/sec-accessing-doc-online.xml | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequest.java | 0 opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyTransportProvider.java | 0 opendj-sdk/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Adapters.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResponseImpl.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RegexSyntaxTestCase.java | 0 opendj-sdk/opendj-virtual/src/test/java/org/forgerock/opendj/virtual/JDBCConnectionTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Filter.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_zh_TW.properties | 0 opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequest.java | 0 opendj-sdk/opendj-core/src/test/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/AbstractLDAPFutureResultImpl.java | 0 opendj-sdk/opendj-ldap-sdk/src/site/xdoc/index.xml.vm | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV1RequestControl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleImpl.java | 0 opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Search.java | 0 opendj-sdk/opendj-ldap-sdk-examples/src/site/site.xml | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequest.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResult.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactoryTestCase.java | 0 opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/GetInfo.java | 0 opendj-sdk/src/site/resources/Example.ldif | 0 opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ArgumentException.java | 0 opendj-sdk/src/main/docbkx/dev-guide/man-modrate.xml | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequest.java | 0 opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationContainer.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeParser.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableGenericIntermediateResponseImpl.java | 0 opendj-sdk/opendj-server2x-adapter/src/test/resources/locks/backend-tasks.lock | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFilter.java | 0 opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/ReferenceCountedObject.java | 0 opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AuthzIdTemplate.java | 0 opendj-sdk/src/main/docbkx/dev-guide/man-ldappasswordmodify.xml | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FaxSyntaxImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordExactEqualityMatchingRuleImpl.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ArgumentParser.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRule.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPConnectionFactory.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/io/LDAPReaderWriterTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/RequestsTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithm.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractExtendedResult.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationSyntaxImpl.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/SearchScopeTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCancelExtendedRequestImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResult.java | 0 opendj-sdk/src/main/docbkx/dev-guide/chap-i18n.xml | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java | 0 opendj-sdk/src/main/docbkx/shared/glossary.xml | 0 opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/package-info.java | 0 opendj-sdk/opendj-server2x-adapter/src/test/resources/locks/backend-ads-truststore.lock | 0 opendj-sdk/opendj-rest2ldap-servlet/src/main/java/org/forgerock/opendj/rest2ldap/servlet/Rest2LDAPConnectionFactoryProvider.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiablePasswordModifyExtendedResultImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/IntermediateResponseHandler.java | 0 opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/SASLAuth.java | 0 opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/package-info.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GuideSyntaxTest.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIF.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutChecker.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableModifyRequestImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/KeywordEqualityMatchingRuleImpl.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleTest.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryReader.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCRAMMD5SASLBindRequestImpl.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/assembly/libbat/setcp.bat | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/TemplateTagTestcase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringEqualityMatchingRuleImpl.java | 0 opendj-sdk/opendj-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControlTestCase.java | 0 opendj-sdk/opendj-server2x-adapter/src/test/resources/config/tasks.ldif | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleImpl.java | 0 opendj-sdk/src/main/docbkx/shared/sec-interface-stability.xml | 0 opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bat/ldapsearch.bat | 0 opendj-sdk/opendj-core/src/main/resources/org/forgerock/opendj/ldif/last.names | 0 opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedRequest.java | 0 opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/CompletedFutureResult.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSyntaxImpl.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bat/authrate.bat | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/GenericBindRequestTestCase.java | 0 opendj-sdk/opendj-server2x-adapter/src/test/resources/config/ads-truststore.pin | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequenceReader.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entry.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/SSLContextBuilder.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/EntryNotFoundException.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NameFormTestCase.java | 0 opendj-sdk/opendj-ldap-toolkit/src/site/xdoc/index.xml.vm | 0 opendj-sdk/opendj-ldap-toolkit/README | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/FilterVisitor.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequest.java | 0 opendj-sdk/opendj-ldap-sdk/pom.xml | 0 opendj-sdk/opendj-ldap-sync/src/main/assembly/libbat/_client-script.bat | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AuthorizationException.java | 0 opendj-sdk/src/main/docbkx/dev-guide/chap-simple-proxy.xml | 0 opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedResult.java | 0 opendj-sdk/opendj-server2x-adapter/src/test/resources/locks/backend-monitor.lock | 0 opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/RecursiveFutureResult.java | 0 opendj-sdk/opendj-virtual/src/main/java/org/forgerock/opendj/virtual/JoinConnection.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Reader.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableExtendedRequest.java | 0 opendj-sdk/src/site/xdoc/docs.xml | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponse.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultReferenceImpl.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxTest.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/TrustManagers.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaUtils.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ManageDsaITRequestControl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/Requests.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/WordEqualityMatchingRuleImpl.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1ReaderTestCase.java | 0 opendj-sdk/opendj-virtual/src/main/java/org/forgerock/opendj/virtual/JDBCConnection.java | 0 opendj-sdk/src/main/docbkx/dev-guide/chap-writing.xml | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadResponseControl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DefaultSchema.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitor.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Responses.java | 0 opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedResult.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Response.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedHashMapEntry.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/AbstractLDIFTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultEntryImpl.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/MemoryBackendTestCase.java | 0 opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPClientFilter.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/LDAPUrlTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractIntermediateResponse.java | 0 opendj-sdk/opendj-ldap-sdk/src/site/site.xml | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutResultException.java | 0 opendj-sdk/opendj-core/src/main/resources/org/forgerock/opendj/ldif/states | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxTest.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConstraintViolationException.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequestImpl.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleTest.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ConsoleApplication.java | 0 opendj-sdk/src/main/docbkx/dev-guide/man-searchrate.xml | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSubstringMatchingRuleImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaElement.java | 0 opendj-sdk/opendj-core/src/main/resources/org/forgerock/opendj/ldif/people_and_groups.template | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Function.java | 0 opendj-sdk/src/main/docbkx/dev-guide/man-ldifdiff.xml | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutEventListener.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleTest.java | 0 opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/package-info.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiringResponseControl.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1InputStreamReaderTestCase.java | 0 opendj-sdk/opendj-virtual/src/test/java/org/forgerock/opendj/virtual/JDBCMapperTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectIdentifierEqualityMatchingRuleImpl.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ExtendedRequestTestCase.java | 0 opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/DefaultTCPNIOTransport.java | 0 opendj-sdk/opendj-rest2ldap/README | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java | 0 opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/SearchAsync.java | 0 opendj-sdk/src/main/docbkx/dev-guide/images/ldap-tree.png | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ConnectionState.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameFormSyntaxImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchRequestControl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AuthenticatedConnectionFactory.java | 0 opendj-sdk/opendj-server2x-adapter/src/test/resources/config/admin-truststore | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableResponseImpl.java | 0 opendj-sdk/opendj-virtual/src/test/java/org/forgerock/opendj/virtual/AddRequestTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreListSubstringMatchingRuleImpl.java | 0 opendj-sdk/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_zh_TW.properties | 0 opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequestImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequest.java | 0 opendj-sdk/opendj-virtual/src/main/java/org/forgerock/opendj/virtual/JoinConnectionFactory.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/package-info.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CompareRequest.java | 0 opendj-sdk/opendj-core/src/main/resources/org/forgerock/opendj/ldif/example.template | 0 opendj-sdk/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_fr.properties | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/CancelRequestListener.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/package-info.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriterTestCase.java | 0 opendj-sdk/opendj-core/src/test/java/com/forgerock/opendj/util/ASCIICharPropTestCase.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MultiChoiceArgument.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_fr.properties | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringOrderingMatchingRuleImpl.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ApproximateMatchingRuleTest.java | 0 opendj-sdk/opendj-core/src/test/java/com/forgerock/opendj/util/FutureResultTransformerTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableSimpleBindRequestImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateListSyntaxImpl.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/TestCaseUtils.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPReader.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GenericControl.java | 0 opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyUtils.java | 0 opendj-sdk/legal-notices/CC-BY-NC-ND.txt | 0 opendj-sdk/opendj-ldap-toolkit/src/main/assembly/libbat/_script-util.bat | 0 opendj-sdk/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_es.properties | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/MemoryBackend.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/package-info.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OIDSyntaxImpl.java | 0 opendj-sdk/src/main/docbkx/dev-guide/chap-extended-ops.xml | 0 opendj-sdk/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_de.properties | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancerEventListener.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateFile.java | 0 opendj-sdk/src/main/docbkx/shared/table-filter-operators.xml | 0 opendj-sdk/opendj-ldap-toolkit/src/main/assembly/descriptor.xml | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConditionResult.java | 0 opendj-sdk/legal-notices/CDDLv1_0.txt | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequest.java | 0 opendj-sdk/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/DefaultTCPNIOTransportTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BinarySyntaxImpl.java | 0 opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/GetADChangeNotifications.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/ConnectionsTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaConstants.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubentriesRequestControl.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SyntaxTestCase.java | 0 opendj-sdk/src/main/docbkx/dev-guide/man-ldifmodify.xml | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSyntaxImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/JPEGSyntaxImpl.java | 0 opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AttributeMapper.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateTag.java | 0 opendj-sdk/opendj-core/src/test/java/com/forgerock/opendj/util/UtilTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanSyntaxImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DeleteRequestImpl.java | 0 opendj-sdk/src/main/docbkx/README.txt | 0 opendj-sdk/src/site/resources/.htaccess | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EnumSyntaxTestCase.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/Utils.java | 0 opendj-sdk/opendj-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControlTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyWarningType.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressSyntaxImpl.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryWriterTestCase.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/package-info.java | 0 opendj-sdk/opendj-ldap-toolkit/src/site/site.xml | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/CompareResult.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableExternalSASLBindRequestImpl.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryReaderTestCase.java | 0 opendj-sdk/src/main/docbkx/dev-guide/preface.xml | 0 opendj-sdk/opendj-server2x-adapter/src/test/resources/config/schema/00-core.ldif | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ResultHandler.java | 0 opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ReferenceAttributeMapper.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnection.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Functions.java | 0 opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/ByteSequenceOutputStream.java | 0 opendj-sdk/src/main/docbkx/legal.xml | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRule.java | 0 opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationType.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumOrderingMatchingRule.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/RoundRobinLoadBalancingAlgorithm.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGenericBindRequestImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/RegexSyntaxImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaException.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryWriterTestCase.java | 0 opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPBaseFilter.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxTest.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/LDAP.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ServerConnectionFactory.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/CancelledResultException.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableResultImpl.java | 0 opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/StaticUtils.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyResponseControl.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstringMatchingRuleTest.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TeletexTerminalIdentifierSyntaxImpl.java | 0 opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/RewriterProxy.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitorWriter.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequest.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaValidationPolicy.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/MultipleEntriesFoundException.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFactory.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeTest.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractLDAPMessageHandler.java | 0 opendj-sdk/src/main/docbkx/dev-guide/chap-understanding-ldap.xml | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandler.java | 0 opendj-sdk/opendj-ldap-sync/src/main/assembly/libbat/_script-util.bat | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUse.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnhancedGuideSyntaxImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryWriter.java | 0 opendj-sdk/src/main/docbkx/dev-guide/chap-controls.xml | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchemaImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericBindRequest.java | 0 opendj-sdk/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFTestCase.java | 0 opendj-sdk/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/GrizzlyLDAPReaderWriterTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractFilterVisitor.java | 0 opendj-sdk/opendj-ldap-sync/pom.xml | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGSSAPISASLBindRequestImpl.java | 0 opendj-sdk/opendj-virtual/src/main/java/org/forgerock/opendj/virtual/JDBCMapper.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/package-info.java | 0 opendj-sdk/opendj-server2x-adapter/src/test/resources/config/admin-keystore.pin | 0 opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bat/ldappasswordmodify.bat | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Matcher.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/GeneralizedTime.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSyntaxImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchChangeType.java | 0 opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/SubstringReader.java | 0 opendj-sdk/src/site/xdoc/index.xml | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRuleSyntaxImpl.java | 0 opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/package-info.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequest.java | 0 opendj-sdk/opendj-ldap-sdk-examples/pom.xml | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleTest.java | 0 opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/ASN1BufferWriter.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableCompareResultImpl.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryReaderTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ConflictingSchemaElementException.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Base64.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AuthenticationException.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResultDecoder.java | 0 opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyLDAPConnection.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EqualLengthApproximateMatchingRuleImpl.java | 0 opendj-sdk/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/ConnectionFactoryTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connections.java | 0 opendj-sdk/src/site/xdoc/news.xml | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchResultReferenceIOException.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPExtendedFutureResultImpl.java | 0 opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Controls.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributeParserTestCase.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/assembly/libbat/_client-script.bat | 0 opendj-sdk/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactoryTestCase.java | 0 opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/SimpleAuth.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ModRate.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bin/ldapmodify | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordSyntaxImpl.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bat/ldifsearch.bat | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SyntaxImpl.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaCompatTest.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPListener.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/IntermediateResponse.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java | 0 opendj-sdk/opendj-ldap-sync/src/main/assembly/bin/ldapsync | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractExtendedRequest.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1OutputStreamWriter.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadRequestControl.java | 0 opendj-sdk/opendj-server2x-adapter/src/test/resources/config/config.properties | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/responses/ResponsesTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPCompareFutureResultImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxImpl.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bin/ldappasswordmodify | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordReader.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/SdkTestCase.java | 0 opendj-sdk/opendj-ldap-sync/src/main/assembly/bat/ldapsync.bat | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryWriter.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GuideSyntaxImpl.java | 0 opendj-sdk/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_ja.properties | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelexNumberSyntaxImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxImpl.java | 0 opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactory.java | 0 opendj-sdk/opendj-rest2ldap-servlet/src/main/webapp/WEB-INF/web.xml | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponseImpl.java | 0 opendj-sdk/opendj-logo.png | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindRequest.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPSearchFutureResultImpl.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/RDNTestCase.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSchemaElementTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedAttribute.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ResultCode.java | 0 opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/ConnectionSecurityLayerFilter.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxTest.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstitutionSyntaxTestCase.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bat/ldapmodify.bat | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbandonRequest.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableSearchRequestImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassSyntaxImpl.java | 0 opendj-sdk/opendj-server2x-adapter/src/test/resources/locks/backend-schema.lock | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractEntry.java | 0 opendj-sdk/src/site/site.xml | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxImpl.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/CompareRequestTestCase.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AddRequestTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/Request.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AuthPasswordExactEqualityMatchingRuleImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/MatchedValuesRequestControl.java | 0 opendj-sdk/src/main/docbkx/shared/itemizedlist-download.xml | 0 opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/IntegerArgument.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultEntry.java | 0 opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ShortLife.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindRequest.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxTest.java | 0 opendj-sdk/opendj-server2x-adapter/pom.xml | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/Control.java | 0 opendj-sdk/opendj-grizzly/src/main/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Writer.java | 0 opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Server.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties | 0 opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_ko.properties | 0 opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bin/ldapcompare | 0 opendj-sdk/src/site/resources/big-group.ldif | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDOrderingMatchingRuleImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPConnectionFactory.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancingAlgorithm.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequestImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableUnbindRequestImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ControlDecoder.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindClientImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/TransportProvider.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/KeyManagers.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPListenerOptions.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteStringBuilder.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeEqualityMatchingRuleImpl.java | 0 opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Proxy.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxTest.java | 0 opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/Iterators.java | 0 opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/AsynchronousFutureResult.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DeliveryMethodSyntaxImpl.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/FileBasedArgument.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancer.java | 0 opendj-sdk/opendj-ldap-sync/src/main/assembly/libbat/setcp.bat | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PrintableStringSyntaxImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableIntermediateResponseImpl.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/ConnectionStateTest.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/package-info.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/package-info.java | 0 opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/ASCIICharProp.java | 0 opendj-sdk/opendj-server2x-adapter/src/test/resources/config/admin-keystore | 0 opendj-sdk/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/BasicRequestsTest.java | 0 opendj-sdk/legal-notices/THIRDPARTYREADME.txt | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTest.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SimpleBindRequest.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResult.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/DereferenceAliasesPolicy.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_zh_CN.properties | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnection.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbandonRequestImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractBindRequest.java | 0 opendj-sdk/src/main/docbkx/dev-guide/man-authrate.xml | 0 opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/UpdateGroup.java | 0 opendj-sdk/src/main/docbkx/dev-guide/chap-getting-directory-info.xml | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EntrySchemaCheckingTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequest.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubtreeDeleteRequestControl.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bin/authrate | 0 opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bin/makeldif | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumSyntaxImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ModificationType.java | 0 opendj-sdk/src/main/docbkx/dev-guide/index.xml | 0 opendj-sdk/opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/EmbeddedServerTestCaseUtils.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GetEffectiveRightsRequestControl.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicTransportProvider.java | 0 opendj-sdk/opendj-virtual/README | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedChangeRecordListener.java | 0 opendj-sdk/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ToolsTestCase.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestTestCase.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_es.properties | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ReferralException.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxImpl.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteSequenceTestCase.java | 0 opendj-sdk/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Converters.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSubstringMatchingRuleImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Attributes.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AuthPasswordSyntaxImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleImpl.java | 0 opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ObjectAttributeMapper.java | 0 opendj-sdk/opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/AdaptersTestCase.java | 0 opendj-sdk/opendj-rest2ldap-servlet/src/main/java/org/forgerock/opendj/rest2ldap/servlet/Rest2LDAPContextFactory.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableBindResultImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnection.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/package-info.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ApplicationKeyManager.java | 0 opendj-sdk/opendj-virtual/src/main/java/org/forgerock/opendj/virtual/JDBCConnectionFactory.java | 0 opendj-sdk/src/main/docbkx/dev-guide/man-ldapsearch.xml | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PostalAddressSyntaxImpl.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/TypesTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/FutureResult.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockConnectionEventListener.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/EntriesTestCase.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/assembly/libbin/_client-script.sh | 0 opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedRequest.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ErrorResultIOException.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCompareRequestImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SubstringAssertionSyntaxImpl.java | 0 opendj-sdk/opendj-rest2ldap-servlet/src/main/java/org/forgerock/opendj/rest2ldap/servlet/package-info.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/controls/ControlsTestCase.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDEqualityMatchingRuleImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequest.java | 0 opendj-sdk/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/GrizzlyLDAPListenerTestCase.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleTest.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ToolConstants.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerOrderingMatchingRuleImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResultImpl.java | 0 opendj-sdk/opendj-server2x-adapter/src/test/resources/locks/backend-userRoot.lock | 0 opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AbstractLDAPAttributeMapper.java | 0 opendj-sdk/opendj-server2x-adapter/src/test/resources/config/schema/04-rfc2307bis.ldif | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPWriter.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFWriter.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/SearchRequestTestCase.java | 0 opendj-sdk/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/filters/package-info.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bat/modrate.bat | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableWhoAmIExtendedResultImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxImpl.java | 0 opendj-sdk/opendj-ldap-sync/src/main/assembly/libbin/_client-script.sh | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAbandonRequestImpl.java | 0 opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SimpleAttributeMapper.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeOrderingMatchingRuleImpl.java | 0 opendj-sdk/opendj-core/src/main/javadoc/overview.html | 0 opendj-sdk/src/main/docbkx/dev-guide/man-ldapmodify.xml | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableSearchResultEntryImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResultImpl.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CoreSchemaTest.java | 0 opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java | 0 opendj-sdk/src/main/docbkx/dev-guide/chap-authenticating.xml | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleImpl.java | 0 opendj-sdk/src/main/docbkx/shared/sec-joining-the-community.xml | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionSecurityLayer.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java | 0 opendj-sdk/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/filters/FilterResult.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractRequestImpl.java | 0 opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/NameStrategy.java | 0 opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/SizeLimitInputStream.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableModifyDNRequestImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryReader.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java | 0 opendj-sdk/opendj-server2x-adapter/src/test/resources/config/schema/01-pwpolicy.ldif | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableSASLBindRequest.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Modification.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortRequestControl.java | 0 opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/Pair.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockScheduler.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/TreeMapEntry.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/assembly/libbin/_script-util.sh | 0 opendj-sdk/opendj-rest2ldap-servlet/src/main/java/org/forgerock/opendj/rest2ldap/servlet/Rest2LDAPAuthnFilter.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactory.java | 0 opendj-sdk/README | 0 opendj-sdk/opendj-virtual/MappingConfig.properties | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ErrorResultException.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bat/ldapcompare.bat | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UniqueMemberEqualityMatchingRuleImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequest.java | 0 opendj-sdk/opendj-server2x-adapter/src/test/resources/locks/server.lock | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ServerConnection.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassType.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bat/ldifdiff.bat | 0 opendj-sdk/src/main/docbkx/shared/sec-formatting-conventions.xml | 0 opendj-sdk/src/site/fml/faq.fml | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Writer.java | 0 opendj-sdk/opendj-core/pom.xml | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindClient.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Schema.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequest.java | 0 opendj-sdk/opendj-virtual/src/main/java/org/forgerock/opendj/virtual/MappingConfigurationManager.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1OutputStreamWriterTestCase.java | 0 opendj-sdk/opendj-ldap-sdk-examples/src/main/javadoc/overview.html | 0 opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bin/ldapsearch | 0 opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AuthorizationPolicy.java | 0 opendj-sdk/src/main/docbkx/shared/sec-release-levels.xml | 0 opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/WritabilityPolicy.java | 0 opendj-sdk/opendj-rest2ldap-servlet/src/main/webapp/opendj-rest2ldap-servlet.json | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberEqualityMatchingRuleImpl.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleTest.java | 0 opendj-sdk/opendj-ldap-sync/src/main/assembly/descriptor.xml | 0 opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/BooleanArgument.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequest.java | 0 opendj-sdk/opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/ConvertersTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableBindRequest.java | 0 opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Utils.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeOptions.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewRequestControl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableStartTLSExtendedRequestImpl.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_de.properties | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleTest.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1WriterTestCase.java | 0 opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/StringArgument.java | 0 opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/StringPrepProfile.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchResultHandler.java | 0 opendj-sdk/src/main/docbkx/dev-guide/chap-reading.xml | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AddRequestImpl.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableDeleteRequestImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnectionFactory.java | 0 opendj-sdk/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ConnectionFactoryProviderTest.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/OrderingMatchingRuleTest.java | 0 opendj-sdk/opendj-rest2ldap/pom.xml | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/SchemaResolver.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractMapEntry.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyRequest.java | 0 opendj-sdk/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/ASN1BufferReaderTestCase.java | 0 opendj-sdk/src/main/docbkx/dev-guide/chap-ldif.xml | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyErrorType.java | 0 opendj-sdk/opendj-ldap-sync/src/main/assembly/libbin/_script-util.sh | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/EntryTestCase.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/Argument.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableGenericExtendedResultImpl.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringBuilderTestCase.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AbandonRequestTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/Collections2.java | 0 opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ParseAttributes.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/EntryFactory.java | 0 opendj-sdk/opendj-ldap-toolkit/pom.xml | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResultImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequence.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/package-info.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameSyntaxImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnectionWrapper.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriter.java | 0 opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/LDAPCollectionResourceProvider.java | 0 opendj-sdk/src/site/xdoc/404.xml | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/ConnectionPoolTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadResponseControl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAnonymousSASLBindRequestImpl.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaUtilsTest.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestTestCase.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/RequestTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPUrl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/EntryChangeNotificationResponseControl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSubstringMatchingRuleImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedLDIFListener.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResultImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestImpl.java | 0 opendj-sdk/opendj-server2x-adapter/src/test/resources/locks/backend-adminRoot.lock | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestImpl.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ConnectionFactoryProvider.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPFutureResultImpl.java | 0 opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/JSONConstantAttributeMapper.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractSASLBindRequest.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bin/ldifsearch | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableExtendedResultImpl.java | 0 opendj-sdk/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/filters/Filter.java | 0 opendj-sdk/opendj-core/src/test/java/com/forgerock/opendj/util/StaticUtilsTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AssertionFailureException.java | 0 opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperation.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyRequestImpl.java | 0 opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/package-info.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPBindFutureResultImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractOrderingMatchingRuleImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequestDecoder.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityRequestControl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPListenerImpl.java | 0 opendj-sdk/opendj-core/src/test/java/com/forgerock/opendj/util/StringPrepProfileTestCase.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bat/searchrate.bat | 0 opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bin/ldifmodify | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractExtendedResultDecoder.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericBindRequestImpl.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/EntryGeneratorTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/SortKey.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Assertion.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortResponseControl.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxTest.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringSyntaxImpl.java | 0 opendj-sdk/opendj-core/src/test/java/com/forgerock/opendj/util/ReferenceCountedObjectTestCase.java | 0 opendj-sdk/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/filters/ChangeRecordContext.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxDescriptionSyntaxImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResultImpl.java | 0 opendj-sdk/opendj-rest2ldap-servlet/pom.xml | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SimplePagedResultsControl.java | 0 opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ProxyBackend.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AddRequest.java | 0 opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/SearchBind.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableRequest.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_ja.properties | 0 opendj-sdk/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/package-info.java | 0 opendj-sdk/opendj-server2x-adapter/src/test/resources/config/ads-truststore | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Result.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionPool.java | 0 opendj-sdk/opendj-ldap-sdk-examples/src/test/bin/checkRewriterProxy.sh | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SupportedAlgorithmSyntaxImpl.java | 0 opendj-sdk/opendj-ldap-sync/README | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleTest.java | 0 opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AuthenticatedConnectionContext.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/LinkedAttributeTestCase.java | 0 opendj-sdk/opendj-server2x-adapter/src/test/resources/config/schema/02-config.ldif | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/FilterTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResult.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyRequestTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionEventListener.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameAndOptionalUIDSyntaxImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnbindRequestImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreListEqualityMatchingRuleImpl.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateSyntaxImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAttribute.java | 0 opendj-sdk/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_zh_CN.properties | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UnknownSchemaElementException.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxTest.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DeleteRequest.java | 0 opendj-sdk/opendj-virtual/src/main/java/org/forgerock/opendj/virtual/TestUpdate.class | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractMatchingRuleImpl.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Reader.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1ByteSequenceReaderTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/RealAttributesOnlyRequestControl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiablePlainSASLBindRequestImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionFactory.java | 0 opendj-sdk/opendj-grizzly/pom.xml | 0 opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadRequestControl.java | 0 opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPServerFilter.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFReader.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleImpl.java | 0 opendj-sdk/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/filters/Matchers.java | 0 opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Modify.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java | 0 opendj-sdk/src/main/docbkx/dev-guide/man-ldifsearch.xml | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPMessageHandler.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchema.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleTest.java | 0 opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/FilterType.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/DataSource.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResult.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnectionTestCase.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributeDescriptionTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CompareRequestImpl.java | 0 opendj-sdk/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/Main.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleTest.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleTest.java | 0 opendj-sdk/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/TestUtils.java | 0 opendj-sdk/src/main/docbkx/dev-guide/chap-best-practices.xml | 0 opendj-sdk/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/ASN1BufferWriterTestCase.java | 0 opendj-sdk/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringEqualityMatchingRuleImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GenerateCoreSchema.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactory.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1InputStreamReader.java | 0 opendj-sdk/opendj-ldap-toolkit/src/test/resources/dummy-truststore | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryGenerator.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFModify.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxTest.java | 0 opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/PasswordResetForAD.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/GeneralizedTimeTest.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bin/searchrate | 0 opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/Iterables.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/CachedConnectionPool.java | 0 opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ReadSchema.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPOptions.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordWriter.java | 0 opendj-sdk/opendj-server2x-adapter/src/test/resources/config/admin-backend.ldif | 0 opendj-sdk/src/main/docbkx/dev-guide/chap-using-the-sdk.xml | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV2RequestControl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPListener.java | 0 opendj-sdk/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/GrizzlyLDAPConnectionTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGenericExtendedRequestImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1ByteSequenceReader.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleImpl.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MultiColumnPrinter.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/Provider.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPClientContext.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AssertionRequestControl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClass.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractSynchronousConnection.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionException.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entries.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestImpl.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bat/makeldif.bat | 0 opendj-sdk/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/package-info.java | 0 opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ReadOnUpdatePolicy.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/FailoverLoadBalancingAlgorithm.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithmTestCase.java | 0 opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyLDAPListener.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FacsimileNumberSyntaxImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/RootDSE.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/CLIException.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyRequestControl.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxTest.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriter.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleTest.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/UnbindRequestTestCase.java | 0 opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/package-info.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchScope.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bin/modrate | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultReference.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificatePairSyntaxImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/RDN.java | 0 opendj-sdk/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/AuthzIdTemplateTest.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthenticatedConnectionFactory.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestTestCase.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bin/ldifdiff | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1.java | 0 opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/FutureResultTransformer.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryWriter.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerEqualityMatchingRuleImpl.java | 0 opendj-sdk/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/GrizzlyUtilsTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressEqualityMatchingRuleImpl.java | 0 opendj-sdk/opendj-core/src/main/resources/org/forgerock/opendj/ldif/streets | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Attribute.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFStream.java | 0 opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Config.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Syntax.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteString.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiablePasswordModifyExtendedRequestImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxImpl.java | 0 opendj-sdk/opendj-virtual/pom.xml | 0 opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ArgumentGroup.java | 0 opendj-sdk/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/filters/Transforms.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bat/ldifmodify.bat | 0 opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/Predicate.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAddRequestImpl.java | 0 opendj-sdk/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_ko.properties | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/BindRequestTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxImpl.java | 0 opendj-sdk/opendj-server2x-adapter/src/test/resources/config/config.ldif | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewResponseControl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableResultImpl.java | 0 opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecord.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxTest.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/TelexSyntaxTest.java | 0 opendj-sdk/pom.xml | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxTest.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestContext.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImpl.java | 0 opendj-sdk/src/main/docbkx/dev-guide/man-ldapcompare.xml | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PermissiveModifyRequestControl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/CompareResultImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringOrderingMatchingRuleImpl.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationEqualityMatchingRuleImpl.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/TestCaseUtilsTestCase.java | 0 opendj-sdk/opendj-server2x-adapter/src/test/resources/locks/backend-backup.lock | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeException.java | 0 opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PromptingTrustManager.java | 0 opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/TimeSource.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ProviderNotFoundException.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableWhoAmIExtendedRequestImpl.java | 0 opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/Validator.java | 0 opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ExtendedOperations.java | 0 opendj-sdk/opendj-ldap-sdk-examples/src/site/xdoc/index.xml.vm | 0 opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFDiff.java | 0 opendj-sdk/src/main/docbkx/dev-guide/chap-get-sdk.xml | 0 opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Context.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeUsage.java | 0 opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/ASN1BufferReader.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/DeleteRequestTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/VirtualAttributesOnlyRequestControl.java | 0 opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestTestCase.java | 0 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java | 0 870 files changed, 0 insertions(+), 0 deletions(-) diff --git a/opendj-sdk/opendj3/README b/opendj-sdk/README similarity index 100% rename from opendj-sdk/opendj3/README rename to opendj-sdk/README diff --git a/opendj-sdk/opendj3/legal-notices/CC-BY-NC-ND.txt b/opendj-sdk/legal-notices/CC-BY-NC-ND.txt similarity index 100% rename from opendj-sdk/opendj3/legal-notices/CC-BY-NC-ND.txt rename to opendj-sdk/legal-notices/CC-BY-NC-ND.txt diff --git a/opendj-sdk/opendj3/legal-notices/CDDLv1_0.txt b/opendj-sdk/legal-notices/CDDLv1_0.txt similarity index 100% rename from opendj-sdk/opendj3/legal-notices/CDDLv1_0.txt rename to opendj-sdk/legal-notices/CDDLv1_0.txt diff --git a/opendj-sdk/opendj3/legal-notices/THIRDPARTYREADME.txt b/opendj-sdk/legal-notices/THIRDPARTYREADME.txt similarity index 100% rename from opendj-sdk/opendj3/legal-notices/THIRDPARTYREADME.txt rename to opendj-sdk/legal-notices/THIRDPARTYREADME.txt diff --git a/opendj-sdk/opendj3/opendj-core/pom.xml b/opendj-sdk/opendj-core/pom.xml similarity index 100% rename from opendj-sdk/opendj3/opendj-core/pom.xml rename to opendj-sdk/opendj-core/pom.xml diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControl.java b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControl.java rename to opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControl.java b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControl.java rename to opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/RealAttributesOnlyRequestControl.java b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/RealAttributesOnlyRequestControl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/RealAttributesOnlyRequestControl.java rename to opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/RealAttributesOnlyRequestControl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/VirtualAttributesOnlyRequestControl.java b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/VirtualAttributesOnlyRequestControl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/VirtualAttributesOnlyRequestControl.java rename to opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/VirtualAttributesOnlyRequestControl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/package-info.java b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/package-info.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/package-info.java rename to opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/package-info.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedRequest.java b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedRequest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedRequest.java rename to opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedRequest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedResult.java b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedResult.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedResult.java rename to opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedResult.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java rename to opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedRequest.java b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedRequest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedRequest.java rename to opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedRequest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedResult.java b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedResult.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedResult.java rename to opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedResult.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperation.java b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperation.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperation.java rename to opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperation.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationContainer.java b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationContainer.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationContainer.java rename to opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationContainer.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationType.java b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationType.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationType.java rename to opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationType.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/package-info.java b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/package-info.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/package-info.java rename to opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/package-info.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/ASCIICharProp.java b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/ASCIICharProp.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/ASCIICharProp.java rename to opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/ASCIICharProp.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/AsynchronousFutureResult.java b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/AsynchronousFutureResult.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/AsynchronousFutureResult.java rename to opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/AsynchronousFutureResult.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/ByteSequenceOutputStream.java b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/ByteSequenceOutputStream.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/ByteSequenceOutputStream.java rename to opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/ByteSequenceOutputStream.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/Collections2.java b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/Collections2.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/Collections2.java rename to opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/Collections2.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/CompletedFutureResult.java b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/CompletedFutureResult.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/CompletedFutureResult.java rename to opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/CompletedFutureResult.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/FutureResultTransformer.java b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/FutureResultTransformer.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/FutureResultTransformer.java rename to opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/FutureResultTransformer.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/Iterables.java b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/Iterables.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/Iterables.java rename to opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/Iterables.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/Iterators.java b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/Iterators.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/Iterators.java rename to opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/Iterators.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/Pair.java b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/Pair.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/Pair.java rename to opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/Pair.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/Predicate.java b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/Predicate.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/Predicate.java rename to opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/Predicate.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/RecursiveFutureResult.java b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/RecursiveFutureResult.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/RecursiveFutureResult.java rename to opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/RecursiveFutureResult.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/ReferenceCountedObject.java b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/ReferenceCountedObject.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/ReferenceCountedObject.java rename to opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/ReferenceCountedObject.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/SizeLimitInputStream.java b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/SizeLimitInputStream.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/SizeLimitInputStream.java rename to opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/SizeLimitInputStream.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/StaticUtils.java b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/StaticUtils.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/StaticUtils.java rename to opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/StaticUtils.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/StringPrepProfile.java b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/StringPrepProfile.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/StringPrepProfile.java rename to opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/StringPrepProfile.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/SubstringReader.java b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/SubstringReader.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/SubstringReader.java rename to opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/SubstringReader.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/TimeSource.java b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/TimeSource.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/TimeSource.java rename to opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/TimeSource.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/Validator.java b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/Validator.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/Validator.java rename to opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/Validator.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/package-info.java b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/package-info.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/package-info.java rename to opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/package-info.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1ByteSequenceReader.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1ByteSequenceReader.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1ByteSequenceReader.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1ByteSequenceReader.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1InputStreamReader.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1InputStreamReader.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1InputStreamReader.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1InputStreamReader.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1OutputStreamWriter.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1OutputStreamWriter.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1OutputStreamWriter.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1OutputStreamWriter.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Reader.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Reader.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Reader.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Reader.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Writer.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Writer.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Writer.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Writer.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Reader.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Reader.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Reader.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Reader.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Writer.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Writer.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Writer.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Writer.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractLDAPMessageHandler.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractLDAPMessageHandler.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractLDAPMessageHandler.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractLDAPMessageHandler.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/LDAP.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/LDAP.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/LDAP.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/LDAP.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPMessageHandler.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPMessageHandler.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPMessageHandler.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPMessageHandler.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPReader.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPReader.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPReader.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPReader.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPWriter.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPWriter.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPWriter.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPWriter.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/package-info.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/package-info.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/package-info.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/package-info.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnection.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnection.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnection.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnection.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAttribute.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAttribute.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAttribute.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAttribute.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnection.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnection.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnection.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnection.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnectionWrapper.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnectionWrapper.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnectionWrapper.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnectionWrapper.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractEntry.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractEntry.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractEntry.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractEntry.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractFilterVisitor.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractFilterVisitor.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractFilterVisitor.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractFilterVisitor.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithm.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithm.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithm.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithm.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractMapEntry.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractMapEntry.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractMapEntry.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractMapEntry.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractSynchronousConnection.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractSynchronousConnection.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractSynchronousConnection.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractSynchronousConnection.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Assertion.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Assertion.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Assertion.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Assertion.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AssertionFailureException.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AssertionFailureException.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AssertionFailureException.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AssertionFailureException.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Attribute.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Attribute.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Attribute.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Attribute.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFactory.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFactory.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFactory.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFactory.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFilter.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFilter.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFilter.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFilter.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeParser.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeParser.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeParser.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeParser.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Attributes.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Attributes.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Attributes.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Attributes.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AuthenticatedConnectionFactory.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AuthenticatedConnectionFactory.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AuthenticatedConnectionFactory.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AuthenticatedConnectionFactory.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AuthenticationException.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AuthenticationException.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AuthenticationException.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AuthenticationException.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AuthorizationException.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AuthorizationException.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AuthorizationException.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AuthorizationException.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Base64.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Base64.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Base64.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Base64.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequence.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequence.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequence.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequence.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequenceReader.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequenceReader.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequenceReader.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequenceReader.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteString.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteString.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteString.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteString.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteStringBuilder.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteStringBuilder.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteStringBuilder.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteStringBuilder.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/CachedConnectionPool.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/CachedConnectionPool.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/CachedConnectionPool.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/CachedConnectionPool.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/CancelRequestListener.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/CancelRequestListener.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/CancelRequestListener.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/CancelRequestListener.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/CancelledResultException.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/CancelledResultException.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/CancelledResultException.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/CancelledResultException.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConditionResult.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConditionResult.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConditionResult.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConditionResult.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connection.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connection.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connection.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connection.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionEventListener.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionEventListener.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionEventListener.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionEventListener.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionException.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionException.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionException.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionException.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionFactory.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionFactory.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionFactory.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionFactory.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionPool.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionPool.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionPool.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionPool.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionSecurityLayer.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionSecurityLayer.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionSecurityLayer.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionSecurityLayer.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connections.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connections.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connections.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connections.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConstraintViolationException.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConstraintViolationException.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConstraintViolationException.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConstraintViolationException.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeException.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeException.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeException.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeException.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeOptions.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeOptions.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeOptions.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeOptions.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/DereferenceAliasesPolicy.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/DereferenceAliasesPolicy.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/DereferenceAliasesPolicy.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/DereferenceAliasesPolicy.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entries.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entries.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entries.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entries.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entry.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entry.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entry.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entry.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/EntryFactory.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/EntryFactory.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/EntryFactory.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/EntryFactory.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/EntryNotFoundException.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/EntryNotFoundException.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/EntryNotFoundException.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/EntryNotFoundException.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ErrorResultException.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ErrorResultException.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ErrorResultException.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ErrorResultException.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ErrorResultIOException.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ErrorResultIOException.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ErrorResultIOException.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ErrorResultIOException.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/FailoverLoadBalancingAlgorithm.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/FailoverLoadBalancingAlgorithm.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/FailoverLoadBalancingAlgorithm.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/FailoverLoadBalancingAlgorithm.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Filter.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Filter.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Filter.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Filter.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/FilterVisitor.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/FilterVisitor.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/FilterVisitor.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/FilterVisitor.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Function.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Function.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Function.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Function.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Functions.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Functions.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Functions.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Functions.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/FutureResult.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/FutureResult.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/FutureResult.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/FutureResult.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/GeneralizedTime.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/GeneralizedTime.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/GeneralizedTime.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/GeneralizedTime.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactory.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactory.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactory.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactory.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/IntermediateResponseHandler.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/IntermediateResponseHandler.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/IntermediateResponseHandler.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/IntermediateResponseHandler.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnection.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnection.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnection.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnection.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnectionFactory.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnectionFactory.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnectionFactory.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnectionFactory.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/KeyManagers.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/KeyManagers.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/KeyManagers.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/KeyManagers.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPClientContext.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPClientContext.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPClientContext.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPClientContext.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPConnectionFactory.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPConnectionFactory.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPConnectionFactory.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPConnectionFactory.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPListener.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPListener.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPListener.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPListener.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPListenerOptions.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPListenerOptions.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPListenerOptions.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPListenerOptions.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPOptions.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPOptions.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPOptions.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPOptions.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPUrl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPUrl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPUrl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPUrl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedAttribute.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedAttribute.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedAttribute.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedAttribute.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedHashMapEntry.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedHashMapEntry.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedHashMapEntry.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedHashMapEntry.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancer.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancer.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancer.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancer.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancerEventListener.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancerEventListener.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancerEventListener.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancerEventListener.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancingAlgorithm.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancingAlgorithm.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancingAlgorithm.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancingAlgorithm.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Matcher.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Matcher.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Matcher.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Matcher.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/MemoryBackend.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/MemoryBackend.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/MemoryBackend.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/MemoryBackend.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Modification.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Modification.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Modification.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Modification.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ModificationType.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ModificationType.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ModificationType.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ModificationType.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/MultipleEntriesFoundException.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/MultipleEntriesFoundException.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/MultipleEntriesFoundException.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/MultipleEntriesFoundException.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ProviderNotFoundException.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ProviderNotFoundException.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ProviderNotFoundException.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ProviderNotFoundException.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/RDN.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/RDN.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/RDN.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/RDN.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ReferralException.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ReferralException.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ReferralException.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ReferralException.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestContext.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestContext.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestContext.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestContext.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandler.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandler.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandler.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandler.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactory.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactory.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactory.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactory.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ResultCode.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ResultCode.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ResultCode.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ResultCode.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ResultHandler.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ResultHandler.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ResultHandler.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ResultHandler.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/RootDSE.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/RootDSE.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/RootDSE.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/RootDSE.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/RoundRobinLoadBalancingAlgorithm.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/RoundRobinLoadBalancingAlgorithm.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/RoundRobinLoadBalancingAlgorithm.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/RoundRobinLoadBalancingAlgorithm.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/SSLContextBuilder.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/SSLContextBuilder.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/SSLContextBuilder.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/SSLContextBuilder.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/SchemaResolver.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/SchemaResolver.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/SchemaResolver.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/SchemaResolver.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchResultHandler.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchResultHandler.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchResultHandler.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchResultHandler.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchResultReferenceIOException.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchResultReferenceIOException.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchResultReferenceIOException.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchResultReferenceIOException.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchScope.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchScope.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchScope.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchScope.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ServerConnection.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ServerConnection.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ServerConnection.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ServerConnection.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ServerConnectionFactory.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ServerConnectionFactory.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ServerConnectionFactory.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ServerConnectionFactory.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/SortKey.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/SortKey.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/SortKey.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/SortKey.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutChecker.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutChecker.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutChecker.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutChecker.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutEventListener.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutEventListener.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutEventListener.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutEventListener.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutResultException.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutResultException.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutResultException.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutResultException.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/TreeMapEntry.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/TreeMapEntry.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/TreeMapEntry.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/TreeMapEntry.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/TrustManagers.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/TrustManagers.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/TrustManagers.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/TrustManagers.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AssertionRequestControl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AssertionRequestControl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AssertionRequestControl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AssertionRequestControl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityRequestControl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityRequestControl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityRequestControl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityRequestControl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityResponseControl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityResponseControl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityResponseControl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityResponseControl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/Control.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/Control.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/Control.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/Control.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ControlDecoder.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ControlDecoder.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ControlDecoder.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ControlDecoder.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/EntryChangeNotificationResponseControl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/EntryChangeNotificationResponseControl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/EntryChangeNotificationResponseControl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/EntryChangeNotificationResponseControl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GenericControl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GenericControl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GenericControl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GenericControl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GetEffectiveRightsRequestControl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GetEffectiveRightsRequestControl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GetEffectiveRightsRequestControl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GetEffectiveRightsRequestControl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ManageDsaITRequestControl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ManageDsaITRequestControl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ManageDsaITRequestControl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ManageDsaITRequestControl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/MatchedValuesRequestControl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/MatchedValuesRequestControl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/MatchedValuesRequestControl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/MatchedValuesRequestControl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiredResponseControl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiredResponseControl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiredResponseControl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiredResponseControl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiringResponseControl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiringResponseControl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiringResponseControl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiringResponseControl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyErrorType.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyErrorType.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyErrorType.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyErrorType.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyRequestControl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyRequestControl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyRequestControl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyRequestControl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyResponseControl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyResponseControl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyResponseControl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyResponseControl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyWarningType.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyWarningType.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyWarningType.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyWarningType.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PermissiveModifyRequestControl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PermissiveModifyRequestControl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PermissiveModifyRequestControl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PermissiveModifyRequestControl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchChangeType.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchChangeType.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchChangeType.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchChangeType.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchRequestControl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchRequestControl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchRequestControl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchRequestControl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadRequestControl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadRequestControl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadRequestControl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadRequestControl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadResponseControl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadResponseControl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadResponseControl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadResponseControl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadRequestControl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadRequestControl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadRequestControl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadRequestControl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadResponseControl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadResponseControl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadResponseControl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadResponseControl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV1RequestControl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV1RequestControl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV1RequestControl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV1RequestControl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV2RequestControl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV2RequestControl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV2RequestControl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV2RequestControl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortRequestControl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortRequestControl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortRequestControl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortRequestControl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortResponseControl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortResponseControl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortResponseControl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortResponseControl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SimplePagedResultsControl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SimplePagedResultsControl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SimplePagedResultsControl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SimplePagedResultsControl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubentriesRequestControl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubentriesRequestControl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubentriesRequestControl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubentriesRequestControl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubtreeDeleteRequestControl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubtreeDeleteRequestControl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubtreeDeleteRequestControl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubtreeDeleteRequestControl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewRequestControl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewRequestControl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewRequestControl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewRequestControl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewResponseControl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewResponseControl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewResponseControl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewResponseControl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/package-info.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/package-info.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/package-info.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/package-info.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/package-info.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/package-info.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/package-info.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/package-info.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbandonRequest.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbandonRequest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbandonRequest.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbandonRequest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbandonRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbandonRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbandonRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbandonRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractBindRequest.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractBindRequest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractBindRequest.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractBindRequest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractExtendedRequest.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractExtendedRequest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractExtendedRequest.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractExtendedRequest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractSASLBindRequest.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractSASLBindRequest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractSASLBindRequest.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractSASLBindRequest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableBindRequest.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableBindRequest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableBindRequest.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableBindRequest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableExtendedRequest.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableExtendedRequest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableExtendedRequest.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableExtendedRequest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableRequest.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableRequest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableRequest.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableRequest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableSASLBindRequest.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableSASLBindRequest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableSASLBindRequest.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableSASLBindRequest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AddRequest.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AddRequest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AddRequest.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AddRequest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AddRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AddRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AddRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AddRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequest.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequest.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindClient.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindClient.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindClient.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindClient.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindClientImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindClientImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindClientImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindClientImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindRequest.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindRequest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindRequest.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindRequest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequest.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequest.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequest.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequest.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CompareRequest.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CompareRequest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CompareRequest.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CompareRequest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CompareRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CompareRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CompareRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CompareRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DeleteRequest.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DeleteRequest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DeleteRequest.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DeleteRequest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DeleteRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DeleteRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DeleteRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DeleteRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequest.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequest.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequest.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequest.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequestDecoder.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequestDecoder.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequestDecoder.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequestDecoder.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequest.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequest.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequest.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequest.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericBindRequest.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericBindRequest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericBindRequest.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericBindRequest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericBindRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericBindRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericBindRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericBindRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequest.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequest.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequest.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequest.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyRequest.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyRequest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyRequest.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyRequest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequest.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequest.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequest.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequest.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/Request.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/Request.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/Request.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/Request.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/Requests.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/Requests.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/Requests.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/Requests.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindClientImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindClientImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindClientImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindClientImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindRequest.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindRequest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindRequest.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindRequest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequest.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequest.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SimpleBindRequest.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SimpleBindRequest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SimpleBindRequest.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SimpleBindRequest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequest.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequest.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnbindRequest.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnbindRequest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnbindRequest.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnbindRequest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnbindRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnbindRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnbindRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnbindRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAbandonRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAbandonRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAbandonRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAbandonRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAddRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAddRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAddRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAddRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAnonymousSASLBindRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAnonymousSASLBindRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAnonymousSASLBindRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAnonymousSASLBindRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCRAMMD5SASLBindRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCRAMMD5SASLBindRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCRAMMD5SASLBindRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCRAMMD5SASLBindRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCancelExtendedRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCancelExtendedRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCancelExtendedRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCancelExtendedRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCompareRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCompareRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCompareRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCompareRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableDeleteRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableDeleteRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableDeleteRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableDeleteRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableDigestMD5SASLBindRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableDigestMD5SASLBindRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableDigestMD5SASLBindRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableDigestMD5SASLBindRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableExternalSASLBindRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableExternalSASLBindRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableExternalSASLBindRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableExternalSASLBindRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGSSAPISASLBindRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGSSAPISASLBindRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGSSAPISASLBindRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGSSAPISASLBindRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGenericBindRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGenericBindRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGenericBindRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGenericBindRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGenericExtendedRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGenericExtendedRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGenericExtendedRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGenericExtendedRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableModifyDNRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableModifyDNRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableModifyDNRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableModifyDNRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableModifyRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableModifyRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableModifyRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableModifyRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiablePasswordModifyExtendedRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiablePasswordModifyExtendedRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiablePasswordModifyExtendedRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiablePasswordModifyExtendedRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiablePlainSASLBindRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiablePlainSASLBindRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiablePlainSASLBindRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiablePlainSASLBindRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableSearchRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableSearchRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableSearchRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableSearchRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableSimpleBindRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableSimpleBindRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableSimpleBindRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableSimpleBindRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableStartTLSExtendedRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableStartTLSExtendedRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableStartTLSExtendedRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableStartTLSExtendedRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableUnbindRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableUnbindRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableUnbindRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableUnbindRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableWhoAmIExtendedRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableWhoAmIExtendedRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableWhoAmIExtendedRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableWhoAmIExtendedRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequest.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequest.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequestImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequestImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequestImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/package-info.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/package-info.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/package-info.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/package-info.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractExtendedResult.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractExtendedResult.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractExtendedResult.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractExtendedResult.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractExtendedResultDecoder.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractExtendedResultDecoder.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractExtendedResultDecoder.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractExtendedResultDecoder.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractIntermediateResponse.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractIntermediateResponse.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractIntermediateResponse.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractIntermediateResponse.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResponseImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResponseImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResponseImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResponseImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResultImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResultImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResultImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResultImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableExtendedResultImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableExtendedResultImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableExtendedResultImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableExtendedResultImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableIntermediateResponseImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableIntermediateResponseImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableIntermediateResponseImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableIntermediateResponseImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableResponseImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableResponseImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableResponseImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableResponseImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableResultImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableResultImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableResultImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableResultImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResult.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResult.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResult.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResult.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResultImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResultImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResultImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResultImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/CompareResult.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/CompareResult.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/CompareResult.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/CompareResult.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/CompareResultImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/CompareResultImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/CompareResultImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/CompareResultImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResult.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResult.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResult.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResult.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResultDecoder.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResultDecoder.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResultDecoder.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResultDecoder.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResult.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResult.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResult.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResult.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResultImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResultImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResultImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResultImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponse.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponse.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponse.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponse.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponseImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponseImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponseImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponseImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/IntermediateResponse.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/IntermediateResponse.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/IntermediateResponse.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/IntermediateResponse.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResult.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResult.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResult.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResult.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResultImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResultImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResultImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResultImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Response.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Response.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Response.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Response.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Responses.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Responses.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Responses.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Responses.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Result.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Result.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Result.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Result.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ResultImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ResultImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ResultImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ResultImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultEntry.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultEntry.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultEntry.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultEntry.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultEntryImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultEntryImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultEntryImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultEntryImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultReference.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultReference.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultReference.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultReference.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultReferenceImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultReferenceImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultReferenceImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultReferenceImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableBindResultImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableBindResultImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableBindResultImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableBindResultImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableCompareResultImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableCompareResultImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableCompareResultImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableCompareResultImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableGenericExtendedResultImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableGenericExtendedResultImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableGenericExtendedResultImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableGenericExtendedResultImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableGenericIntermediateResponseImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableGenericIntermediateResponseImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableGenericIntermediateResponseImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableGenericIntermediateResponseImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiablePasswordModifyExtendedResultImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiablePasswordModifyExtendedResultImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiablePasswordModifyExtendedResultImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiablePasswordModifyExtendedResultImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableResultImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableResultImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableResultImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableResultImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableSearchResultEntryImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableSearchResultEntryImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableSearchResultEntryImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableSearchResultEntryImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableSearchResultReferenceImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableSearchResultReferenceImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableSearchResultReferenceImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableSearchResultReferenceImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableWhoAmIExtendedResultImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableWhoAmIExtendedResultImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableWhoAmIExtendedResultImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableWhoAmIExtendedResultImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResult.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResult.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResult.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResult.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResultImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResultImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResultImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResultImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/package-info.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/package-info.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/package-info.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/package-info.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractOrderingMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractOrderingMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractOrderingMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractOrderingMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeUsage.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeUsage.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeUsage.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeUsage.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AuthPasswordExactEqualityMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AuthPasswordExactEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AuthPasswordExactEqualityMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AuthPasswordExactEqualityMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AuthPasswordSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AuthPasswordSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AuthPasswordSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AuthPasswordSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BinarySyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BinarySyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BinarySyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BinarySyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreListEqualityMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreListEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreListEqualityMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreListEqualityMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreListSubstringMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreListSubstringMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreListSubstringMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreListSubstringMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateListSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateListSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateListSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateListSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificatePairSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificatePairSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificatePairSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificatePairSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ConflictingSchemaElementException.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ConflictingSchemaElementException.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ConflictingSchemaElementException.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ConflictingSchemaElementException.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchema.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchema.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchema.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchema.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchemaImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchemaImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchemaImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchemaImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRule.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRule.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRule.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRule.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRule.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRule.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRule.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRule.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRuleSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRuleSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRuleSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRuleSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DefaultSchema.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DefaultSchema.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DefaultSchema.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DefaultSchema.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DeliveryMethodSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DeliveryMethodSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DeliveryMethodSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DeliveryMethodSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnhancedGuideSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnhancedGuideSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnhancedGuideSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnhancedGuideSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumOrderingMatchingRule.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumOrderingMatchingRule.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumOrderingMatchingRule.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumOrderingMatchingRule.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EqualLengthApproximateMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EqualLengthApproximateMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EqualLengthApproximateMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EqualLengthApproximateMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FacsimileNumberSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FacsimileNumberSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FacsimileNumberSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FacsimileNumberSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FaxSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FaxSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FaxSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FaxSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeEqualityMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeEqualityMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeEqualityMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeOrderingMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeOrderingMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeOrderingMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeOrderingMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GenerateCoreSchema.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GenerateCoreSchema.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GenerateCoreSchema.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GenerateCoreSchema.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GuideSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GuideSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GuideSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GuideSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerEqualityMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerEqualityMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerEqualityMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerOrderingMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerOrderingMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerOrderingMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerOrderingMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/JPEGSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/JPEGSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/JPEGSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/JPEGSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/KeywordEqualityMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/KeywordEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/KeywordEqualityMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/KeywordEqualityMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxDescriptionSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxDescriptionSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxDescriptionSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxDescriptionSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUse.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUse.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUse.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUse.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameAndOptionalUIDSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameAndOptionalUIDSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameAndOptionalUIDSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameAndOptionalUIDSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameFormSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameFormSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameFormSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameFormSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringEqualityMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringEqualityMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringEqualityMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringOrderingMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringOrderingMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringOrderingMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringOrderingMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSubstringMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSubstringMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSubstringMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSubstringMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OIDSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OIDSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OIDSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OIDSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClass.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClass.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClass.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClass.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassType.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassType.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassType.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassType.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectIdentifierEqualityMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectIdentifierEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectIdentifierEqualityMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectIdentifierEqualityMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringEqualityMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringEqualityMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringEqualityMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringOrderingMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringOrderingMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringOrderingMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringOrderingMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSubstringMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSubstringMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSubstringMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSubstringMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PostalAddressSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PostalAddressSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PostalAddressSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PostalAddressSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressEqualityMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressEqualityMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressEqualityMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PrintableStringSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PrintableStringSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PrintableStringSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PrintableStringSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationEqualityMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationEqualityMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationEqualityMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/RegexSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/RegexSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/RegexSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/RegexSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Schema.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Schema.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Schema.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Schema.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaConstants.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaConstants.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaConstants.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaConstants.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaElement.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaElement.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaElement.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaElement.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaException.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaException.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaException.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaException.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaUtils.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaUtils.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaUtils.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaUtils.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaValidationPolicy.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaValidationPolicy.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaValidationPolicy.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaValidationPolicy.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SubstringAssertionSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SubstringAssertionSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SubstringAssertionSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SubstringAssertionSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SupportedAlgorithmSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SupportedAlgorithmSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SupportedAlgorithmSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SupportedAlgorithmSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Syntax.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Syntax.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Syntax.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Syntax.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberEqualityMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberEqualityMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberEqualityMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSubstringMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSubstringMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSubstringMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSubstringMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TeletexTerminalIdentifierSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TeletexTerminalIdentifierSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TeletexTerminalIdentifierSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TeletexTerminalIdentifierSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelexNumberSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelexNumberSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelexNumberSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelexNumberSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDEqualityMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDEqualityMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDEqualityMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDOrderingMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDOrderingMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDOrderingMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDOrderingMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UniqueMemberEqualityMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UniqueMemberEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UniqueMemberEqualityMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UniqueMemberEqualityMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UnknownSchemaElementException.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UnknownSchemaElementException.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UnknownSchemaElementException.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UnknownSchemaElementException.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordExactEqualityMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordExactEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordExactEqualityMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordExactEqualityMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordSyntaxImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordSyntaxImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordSyntaxImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/WordEqualityMatchingRuleImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/WordEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/WordEqualityMatchingRuleImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/WordEqualityMatchingRuleImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/package-info.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/package-info.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/package-info.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/package-info.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/AbstractLDAPFutureResultImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/AbstractLDAPFutureResultImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/AbstractLDAPFutureResultImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/AbstractLDAPFutureResultImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ConnectionState.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ConnectionState.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ConnectionState.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ConnectionState.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPBindFutureResultImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPBindFutureResultImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPBindFutureResultImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPBindFutureResultImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPCompareFutureResultImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPCompareFutureResultImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPCompareFutureResultImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPCompareFutureResultImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionFactoryImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionFactoryImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionFactoryImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionFactoryImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPExtendedFutureResultImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPExtendedFutureResultImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPExtendedFutureResultImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPExtendedFutureResultImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPFutureResultImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPFutureResultImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPFutureResultImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPFutureResultImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPListenerImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPListenerImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPListenerImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPListenerImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPSearchFutureResultImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPSearchFutureResultImpl.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPSearchFutureResultImpl.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPSearchFutureResultImpl.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/Provider.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/Provider.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/Provider.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/Provider.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/TransportProvider.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/TransportProvider.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/TransportProvider.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/TransportProvider.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/package-info.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/package-info.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/package-info.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/package-info.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFReader.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFReader.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFReader.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFReader.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFStream.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFStream.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFStream.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFStream.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFWriter.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFWriter.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFWriter.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFWriter.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecord.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecord.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecord.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecord.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordReader.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordReader.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordReader.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordReader.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitor.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitor.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitor.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitor.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitorWriter.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitorWriter.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitorWriter.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitorWriter.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordWriter.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordWriter.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordWriter.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordWriter.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriter.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriter.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriter.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriter.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryReader.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryReader.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryReader.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryReader.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryWriter.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryWriter.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryWriter.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryWriter.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryGenerator.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryGenerator.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryGenerator.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryGenerator.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryReader.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryReader.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryReader.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryReader.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryWriter.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryWriter.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryWriter.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryWriter.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIF.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIF.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIF.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIF.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriter.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriter.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriter.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriter.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryWriter.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryWriter.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryWriter.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryWriter.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedChangeRecordListener.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedChangeRecordListener.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedChangeRecordListener.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedChangeRecordListener.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedLDIFListener.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedLDIFListener.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedLDIFListener.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedLDIFListener.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateFile.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateFile.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateFile.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateFile.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateTag.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateTag.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateTag.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateTag.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/package-info.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/package-info.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/package-info.java rename to opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/package-info.java diff --git a/opendj-sdk/opendj3/opendj-core/src/main/javadoc/overview.html b/opendj-sdk/opendj-core/src/main/javadoc/overview.html similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/javadoc/overview.html rename to opendj-sdk/opendj-core/src/main/javadoc/overview.html diff --git a/opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties b/opendj-sdk/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties rename to opendj-sdk/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties diff --git a/opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_de.properties b/opendj-sdk/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_de.properties similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_de.properties rename to opendj-sdk/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_de.properties diff --git a/opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_es.properties b/opendj-sdk/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_es.properties similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_es.properties rename to opendj-sdk/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_es.properties diff --git a/opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_fr.properties b/opendj-sdk/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_fr.properties similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_fr.properties rename to opendj-sdk/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_fr.properties diff --git a/opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_ja.properties b/opendj-sdk/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_ja.properties similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_ja.properties rename to opendj-sdk/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_ja.properties diff --git a/opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_ko.properties b/opendj-sdk/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_ko.properties similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_ko.properties rename to opendj-sdk/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_ko.properties diff --git a/opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_zh_CN.properties b/opendj-sdk/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_zh_CN.properties similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_zh_CN.properties rename to opendj-sdk/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_zh_CN.properties diff --git a/opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_zh_TW.properties b/opendj-sdk/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_zh_TW.properties similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_zh_TW.properties rename to opendj-sdk/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_zh_TW.properties diff --git a/opendj-sdk/opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/cities b/opendj-sdk/opendj-core/src/main/resources/org/forgerock/opendj/ldif/cities similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/cities rename to opendj-sdk/opendj-core/src/main/resources/org/forgerock/opendj/ldif/cities diff --git a/opendj-sdk/opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/example.template b/opendj-sdk/opendj-core/src/main/resources/org/forgerock/opendj/ldif/example.template similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/example.template rename to opendj-sdk/opendj-core/src/main/resources/org/forgerock/opendj/ldif/example.template diff --git a/opendj-sdk/opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/first.names b/opendj-sdk/opendj-core/src/main/resources/org/forgerock/opendj/ldif/first.names similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/first.names rename to opendj-sdk/opendj-core/src/main/resources/org/forgerock/opendj/ldif/first.names diff --git a/opendj-sdk/opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/last.names b/opendj-sdk/opendj-core/src/main/resources/org/forgerock/opendj/ldif/last.names similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/last.names rename to opendj-sdk/opendj-core/src/main/resources/org/forgerock/opendj/ldif/last.names diff --git a/opendj-sdk/opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/people_and_groups.template b/opendj-sdk/opendj-core/src/main/resources/org/forgerock/opendj/ldif/people_and_groups.template similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/people_and_groups.template rename to opendj-sdk/opendj-core/src/main/resources/org/forgerock/opendj/ldif/people_and_groups.template diff --git a/opendj-sdk/opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/states b/opendj-sdk/opendj-core/src/main/resources/org/forgerock/opendj/ldif/states similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/states rename to opendj-sdk/opendj-core/src/main/resources/org/forgerock/opendj/ldif/states diff --git a/opendj-sdk/opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/streets b/opendj-sdk/opendj-core/src/main/resources/org/forgerock/opendj/ldif/streets similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/streets rename to opendj-sdk/opendj-core/src/main/resources/org/forgerock/opendj/ldif/streets diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControlTestCase.java b/opendj-sdk/opendj-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControlTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControlTestCase.java rename to opendj-sdk/opendj-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControlTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControlTestCase.java b/opendj-sdk/opendj-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControlTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControlTestCase.java rename to opendj-sdk/opendj-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControlTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/util/ASCIICharPropTestCase.java b/opendj-sdk/opendj-core/src/test/java/com/forgerock/opendj/util/ASCIICharPropTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/util/ASCIICharPropTestCase.java rename to opendj-sdk/opendj-core/src/test/java/com/forgerock/opendj/util/ASCIICharPropTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/util/FutureResultTransformerTestCase.java b/opendj-sdk/opendj-core/src/test/java/com/forgerock/opendj/util/FutureResultTransformerTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/util/FutureResultTransformerTestCase.java rename to opendj-sdk/opendj-core/src/test/java/com/forgerock/opendj/util/FutureResultTransformerTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/util/ReferenceCountedObjectTestCase.java b/opendj-sdk/opendj-core/src/test/java/com/forgerock/opendj/util/ReferenceCountedObjectTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/util/ReferenceCountedObjectTestCase.java rename to opendj-sdk/opendj-core/src/test/java/com/forgerock/opendj/util/ReferenceCountedObjectTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/util/StaticUtilsTestCase.java b/opendj-sdk/opendj-core/src/test/java/com/forgerock/opendj/util/StaticUtilsTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/util/StaticUtilsTestCase.java rename to opendj-sdk/opendj-core/src/test/java/com/forgerock/opendj/util/StaticUtilsTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/util/StringPrepProfileTestCase.java b/opendj-sdk/opendj-core/src/test/java/com/forgerock/opendj/util/StringPrepProfileTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/util/StringPrepProfileTestCase.java rename to opendj-sdk/opendj-core/src/test/java/com/forgerock/opendj/util/StringPrepProfileTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/util/UtilTestCase.java b/opendj-sdk/opendj-core/src/test/java/com/forgerock/opendj/util/UtilTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/util/UtilTestCase.java rename to opendj-sdk/opendj-core/src/test/java/com/forgerock/opendj/util/UtilTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1ByteSequenceReaderTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1ByteSequenceReaderTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1ByteSequenceReaderTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1ByteSequenceReaderTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1InputStreamReaderTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1InputStreamReaderTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1InputStreamReaderTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1InputStreamReaderTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1OutputStreamWriterTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1OutputStreamWriterTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1OutputStreamWriterTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1OutputStreamWriterTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1ReaderTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1ReaderTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1ReaderTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1ReaderTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1WriterTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1WriterTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1WriterTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1WriterTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/io/LDAPReaderWriterTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/io/LDAPReaderWriterTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/io/LDAPReaderWriterTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/io/LDAPReaderWriterTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnectionTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnectionTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnectionTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnectionTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithmTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithmTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithmTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithmTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributeDescriptionTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributeDescriptionTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributeDescriptionTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributeDescriptionTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributeParserTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributeParserTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributeParserTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributeParserTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteSequenceTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteSequenceTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteSequenceTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteSequenceTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringBuilderTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringBuilderTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringBuilderTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringBuilderTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/ConnectionPoolTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/ConnectionPoolTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/ConnectionPoolTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/ConnectionPoolTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/ConnectionsTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/ConnectionsTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/ConnectionsTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/ConnectionsTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/EntriesTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/EntriesTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/EntriesTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/EntriesTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/EntryTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/EntryTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/EntryTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/EntryTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/FilterTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/FilterTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/FilterTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/FilterTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/GeneralizedTimeTest.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/GeneralizedTimeTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/GeneralizedTimeTest.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/GeneralizedTimeTest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactoryTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactoryTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactoryTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactoryTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/LDAPUrlTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/LDAPUrlTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/LDAPUrlTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/LDAPUrlTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/LinkedAttributeTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/LinkedAttributeTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/LinkedAttributeTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/LinkedAttributeTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/MemoryBackendTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/MemoryBackendTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/MemoryBackendTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/MemoryBackendTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockConnectionEventListener.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockConnectionEventListener.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockConnectionEventListener.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockConnectionEventListener.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockScheduler.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockScheduler.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockScheduler.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockScheduler.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/RDNTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/RDNTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/RDNTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/RDNTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/SdkTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/SdkTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/SdkTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/SdkTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/SearchScopeTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/SearchScopeTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/SearchScopeTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/SearchScopeTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/TestCaseUtils.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/TestCaseUtils.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/TestCaseUtils.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/TestCaseUtils.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/TestCaseUtilsTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/TestCaseUtilsTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/TestCaseUtilsTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/TestCaseUtilsTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/TypesTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/TypesTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/TypesTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/TypesTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/controls/ControlsTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/controls/ControlsTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/controls/ControlsTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/controls/ControlsTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AbandonRequestTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AbandonRequestTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AbandonRequestTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AbandonRequestTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AddRequestTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AddRequestTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AddRequestTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AddRequestTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/BindRequestTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/BindRequestTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/BindRequestTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/BindRequestTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/CompareRequestTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/CompareRequestTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/CompareRequestTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/CompareRequestTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/DeleteRequestTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/DeleteRequestTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/DeleteRequestTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/DeleteRequestTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ExtendedRequestTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ExtendedRequestTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ExtendedRequestTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ExtendedRequestTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/GenericBindRequestTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/GenericBindRequestTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/GenericBindRequestTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/GenericBindRequestTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyRequestTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyRequestTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyRequestTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyRequestTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/RequestTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/RequestTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/RequestTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/RequestTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/RequestsTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/RequestsTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/RequestsTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/RequestsTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/SearchRequestTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/SearchRequestTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/SearchRequestTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/SearchRequestTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/UnbindRequestTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/UnbindRequestTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/UnbindRequestTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/UnbindRequestTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/responses/ResponsesTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/responses/ResponsesTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/responses/ResponsesTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/responses/ResponsesTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSchemaElementTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSchemaElementTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSchemaElementTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSchemaElementTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ApproximateMatchingRuleTest.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ApproximateMatchingRuleTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ApproximateMatchingRuleTest.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ApproximateMatchingRuleTest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxTest.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxTest.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxTest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeTest.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeTest.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeTest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleTest.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleTest.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleTest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxTest.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxTest.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxTest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleTest.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleTest.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleTest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleTest.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleTest.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleTest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleTest.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleTest.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleTest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleTest.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleTest.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleTest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleTest.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleTest.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleTest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleTest.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleTest.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleTest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleTest.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleTest.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleTest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleTest.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleTest.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleTest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleTest.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleTest.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleTest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleTest.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleTest.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleTest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CoreSchemaTest.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CoreSchemaTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CoreSchemaTest.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CoreSchemaTest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxTest.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxTest.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxTest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxTest.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxTest.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxTest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleTest.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleTest.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleTest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EntrySchemaCheckingTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EntrySchemaCheckingTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EntrySchemaCheckingTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EntrySchemaCheckingTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EnumSyntaxTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EnumSyntaxTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EnumSyntaxTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EnumSyntaxTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxTest.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxTest.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxTest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GuideSyntaxTest.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GuideSyntaxTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GuideSyntaxTest.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GuideSyntaxTest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxTest.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxTest.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxTest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxTest.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxTest.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxTest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxTest.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxTest.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxTest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTest.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTest.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxTest.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxTest.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxTest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NameFormTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NameFormTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NameFormTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NameFormTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/OrderingMatchingRuleTest.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/OrderingMatchingRuleTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/OrderingMatchingRuleTest.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/OrderingMatchingRuleTest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxTest.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxTest.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxTest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RegexSyntaxTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RegexSyntaxTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RegexSyntaxTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RegexSyntaxTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaCompatTest.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaCompatTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaCompatTest.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaCompatTest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaUtilsTest.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaUtilsTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaUtilsTest.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaUtilsTest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstitutionSyntaxTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstitutionSyntaxTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstitutionSyntaxTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstitutionSyntaxTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstringMatchingRuleTest.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstringMatchingRuleTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstringMatchingRuleTest.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstringMatchingRuleTest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SyntaxTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SyntaxTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SyntaxTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SyntaxTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/TelexSyntaxTest.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/TelexSyntaxTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/TelexSyntaxTest.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/TelexSyntaxTest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxTest.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxTest.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxTest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxTest.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxTest.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxTest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPConnectionFactory.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPConnectionFactory.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPConnectionFactory.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPConnectionFactory.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPListener.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPListener.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPListener.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPListener.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicTransportProvider.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicTransportProvider.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicTransportProvider.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicTransportProvider.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/ConnectionStateTest.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/ConnectionStateTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/ConnectionStateTest.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/ConnectionStateTest.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/LDAPTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/LDAPTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/LDAPTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/LDAPTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/AbstractLDIFTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/AbstractLDIFTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/AbstractLDIFTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/AbstractLDIFTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriterTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriterTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriterTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriterTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryReaderTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryReaderTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryReaderTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryReaderTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryWriterTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryWriterTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryWriterTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryWriterTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/EntryGeneratorTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/EntryGeneratorTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/EntryGeneratorTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/EntryGeneratorTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryReaderTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryReaderTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryReaderTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryReaderTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryWriterTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryWriterTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryWriterTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryWriterTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/TemplateTagTestcase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/TemplateTagTestcase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/TemplateTagTestcase.java rename to opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/TemplateTagTestcase.java diff --git a/opendj-sdk/opendj3/opendj-core/src/test/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider b/opendj-sdk/opendj-core/src/test/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider similarity index 100% rename from opendj-sdk/opendj3/opendj-core/src/test/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider rename to opendj-sdk/opendj-core/src/test/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider diff --git a/opendj-sdk/opendj3/opendj-grizzly/pom.xml b/opendj-sdk/opendj-grizzly/pom.xml similarity index 100% rename from opendj-sdk/opendj3/opendj-grizzly/pom.xml rename to opendj-sdk/opendj-grizzly/pom.xml diff --git a/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/ASN1BufferReader.java b/opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/ASN1BufferReader.java similarity index 100% rename from opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/ASN1BufferReader.java rename to opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/ASN1BufferReader.java diff --git a/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/ASN1BufferWriter.java b/opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/ASN1BufferWriter.java similarity index 100% rename from opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/ASN1BufferWriter.java rename to opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/ASN1BufferWriter.java diff --git a/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/ConnectionSecurityLayerFilter.java b/opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/ConnectionSecurityLayerFilter.java similarity index 100% rename from opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/ConnectionSecurityLayerFilter.java rename to opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/ConnectionSecurityLayerFilter.java diff --git a/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/DefaultTCPNIOTransport.java b/opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/DefaultTCPNIOTransport.java similarity index 100% rename from opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/DefaultTCPNIOTransport.java rename to opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/DefaultTCPNIOTransport.java diff --git a/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyLDAPConnection.java b/opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyLDAPConnection.java similarity index 100% rename from opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyLDAPConnection.java rename to opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyLDAPConnection.java diff --git a/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactory.java b/opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactory.java similarity index 100% rename from opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactory.java rename to opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactory.java diff --git a/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyLDAPListener.java b/opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyLDAPListener.java similarity index 100% rename from opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyLDAPListener.java rename to opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyLDAPListener.java diff --git a/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyTransportProvider.java b/opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyTransportProvider.java similarity index 100% rename from opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyTransportProvider.java rename to opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyTransportProvider.java diff --git a/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyUtils.java b/opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyUtils.java similarity index 100% rename from opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyUtils.java rename to opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyUtils.java diff --git a/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPBaseFilter.java b/opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPBaseFilter.java similarity index 100% rename from opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPBaseFilter.java rename to opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPBaseFilter.java diff --git a/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPClientFilter.java b/opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPClientFilter.java similarity index 100% rename from opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPClientFilter.java rename to opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPClientFilter.java diff --git a/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPServerFilter.java b/opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPServerFilter.java similarity index 100% rename from opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPServerFilter.java rename to opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPServerFilter.java diff --git a/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/package-info.java b/opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/package-info.java similarity index 100% rename from opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/package-info.java rename to opendj-sdk/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/package-info.java diff --git a/opendj-sdk/opendj3/opendj-grizzly/src/main/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider b/opendj-sdk/opendj-grizzly/src/main/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider similarity index 100% rename from opendj-sdk/opendj3/opendj-grizzly/src/main/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider rename to opendj-sdk/opendj-grizzly/src/main/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider diff --git a/opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/ASN1BufferReaderTestCase.java b/opendj-sdk/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/ASN1BufferReaderTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/ASN1BufferReaderTestCase.java rename to opendj-sdk/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/ASN1BufferReaderTestCase.java diff --git a/opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/ASN1BufferWriterTestCase.java b/opendj-sdk/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/ASN1BufferWriterTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/ASN1BufferWriterTestCase.java rename to opendj-sdk/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/ASN1BufferWriterTestCase.java diff --git a/opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/ConnectionFactoryTestCase.java b/opendj-sdk/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/ConnectionFactoryTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/ConnectionFactoryTestCase.java rename to opendj-sdk/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/ConnectionFactoryTestCase.java diff --git a/opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/DefaultTCPNIOTransportTestCase.java b/opendj-sdk/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/DefaultTCPNIOTransportTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/DefaultTCPNIOTransportTestCase.java rename to opendj-sdk/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/DefaultTCPNIOTransportTestCase.java diff --git a/opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactoryTestCase.java b/opendj-sdk/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactoryTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactoryTestCase.java rename to opendj-sdk/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactoryTestCase.java diff --git a/opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/GrizzlyLDAPConnectionTestCase.java b/opendj-sdk/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/GrizzlyLDAPConnectionTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/GrizzlyLDAPConnectionTestCase.java rename to opendj-sdk/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/GrizzlyLDAPConnectionTestCase.java diff --git a/opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/GrizzlyLDAPListenerTestCase.java b/opendj-sdk/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/GrizzlyLDAPListenerTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/GrizzlyLDAPListenerTestCase.java rename to opendj-sdk/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/GrizzlyLDAPListenerTestCase.java diff --git a/opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/GrizzlyLDAPReaderWriterTestCase.java b/opendj-sdk/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/GrizzlyLDAPReaderWriterTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/GrizzlyLDAPReaderWriterTestCase.java rename to opendj-sdk/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/GrizzlyLDAPReaderWriterTestCase.java diff --git a/opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/GrizzlyUtilsTestCase.java b/opendj-sdk/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/GrizzlyUtilsTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/GrizzlyUtilsTestCase.java rename to opendj-sdk/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/GrizzlyUtilsTestCase.java diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk-examples/pom.xml b/opendj-sdk/opendj-ldap-sdk-examples/pom.xml similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sdk-examples/pom.xml rename to opendj-sdk/opendj-ldap-sdk-examples/pom.xml diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Controls.java b/opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Controls.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Controls.java rename to opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Controls.java diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ExtendedOperations.java b/opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ExtendedOperations.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ExtendedOperations.java rename to opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ExtendedOperations.java diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/GetADChangeNotifications.java b/opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/GetADChangeNotifications.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/GetADChangeNotifications.java rename to opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/GetADChangeNotifications.java diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/GetInfo.java b/opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/GetInfo.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/GetInfo.java rename to opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/GetInfo.java diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Modify.java b/opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Modify.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Modify.java rename to opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Modify.java diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ParseAttributes.java b/opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ParseAttributes.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ParseAttributes.java rename to opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ParseAttributes.java diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/PasswordResetForAD.java b/opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/PasswordResetForAD.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/PasswordResetForAD.java rename to opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/PasswordResetForAD.java diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Proxy.java b/opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Proxy.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Proxy.java rename to opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Proxy.java diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ProxyBackend.java b/opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ProxyBackend.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ProxyBackend.java rename to opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ProxyBackend.java diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ReadSchema.java b/opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ReadSchema.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ReadSchema.java rename to opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ReadSchema.java diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/RewriterProxy.java b/opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/RewriterProxy.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/RewriterProxy.java rename to opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/RewriterProxy.java diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/SASLAuth.java b/opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/SASLAuth.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/SASLAuth.java rename to opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/SASLAuth.java diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Search.java b/opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Search.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Search.java rename to opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Search.java diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/SearchAsync.java b/opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/SearchAsync.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/SearchAsync.java rename to opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/SearchAsync.java diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/SearchBind.java b/opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/SearchBind.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/SearchBind.java rename to opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/SearchBind.java diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Server.java b/opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Server.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Server.java rename to opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Server.java diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ShortLife.java b/opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ShortLife.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ShortLife.java rename to opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ShortLife.java diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/SimpleAuth.java b/opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/SimpleAuth.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/SimpleAuth.java rename to opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/SimpleAuth.java diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/UpdateGroup.java b/opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/UpdateGroup.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/UpdateGroup.java rename to opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/UpdateGroup.java diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/package-info.java b/opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/package-info.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/package-info.java rename to opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/package-info.java diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/javadoc/overview.html b/opendj-sdk/opendj-ldap-sdk-examples/src/main/javadoc/overview.html similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/javadoc/overview.html rename to opendj-sdk/opendj-ldap-sdk-examples/src/main/javadoc/overview.html diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/site/site.xml b/opendj-sdk/opendj-ldap-sdk-examples/src/site/site.xml similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/site/site.xml rename to opendj-sdk/opendj-ldap-sdk-examples/src/site/site.xml diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/site/xdoc/index.xml.vm b/opendj-sdk/opendj-ldap-sdk-examples/src/site/xdoc/index.xml.vm similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/site/xdoc/index.xml.vm rename to opendj-sdk/opendj-ldap-sdk-examples/src/site/xdoc/index.xml.vm diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/test/bin/checkRewriterProxy.sh b/opendj-sdk/opendj-ldap-sdk-examples/src/test/bin/checkRewriterProxy.sh similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/test/bin/checkRewriterProxy.sh rename to opendj-sdk/opendj-ldap-sdk-examples/src/test/bin/checkRewriterProxy.sh diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/pom.xml b/opendj-sdk/opendj-ldap-sdk/pom.xml similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sdk/pom.xml rename to opendj-sdk/opendj-ldap-sdk/pom.xml diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/site/site.xml b/opendj-sdk/opendj-ldap-sdk/src/site/site.xml similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/site/site.xml rename to opendj-sdk/opendj-ldap-sdk/src/site/site.xml diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/site/xdoc/index.xml.vm b/opendj-sdk/opendj-ldap-sdk/src/site/xdoc/index.xml.vm similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/site/xdoc/index.xml.vm rename to opendj-sdk/opendj-ldap-sdk/src/site/xdoc/index.xml.vm diff --git a/opendj-sdk/opendj3/opendj-ldap-sync/README b/opendj-sdk/opendj-ldap-sync/README similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sync/README rename to opendj-sdk/opendj-ldap-sync/README diff --git a/opendj-sdk/opendj3/opendj-ldap-sync/pom.xml b/opendj-sdk/opendj-ldap-sync/pom.xml similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sync/pom.xml rename to opendj-sdk/opendj-ldap-sync/pom.xml diff --git a/opendj-sdk/opendj3/opendj-ldap-sync/src/main/assembly/bat/ldapsync.bat b/opendj-sdk/opendj-ldap-sync/src/main/assembly/bat/ldapsync.bat similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sync/src/main/assembly/bat/ldapsync.bat rename to opendj-sdk/opendj-ldap-sync/src/main/assembly/bat/ldapsync.bat diff --git a/opendj-sdk/opendj3/opendj-ldap-sync/src/main/assembly/bin/ldapsync b/opendj-sdk/opendj-ldap-sync/src/main/assembly/bin/ldapsync similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sync/src/main/assembly/bin/ldapsync rename to opendj-sdk/opendj-ldap-sync/src/main/assembly/bin/ldapsync diff --git a/opendj-sdk/opendj3/opendj-ldap-sync/src/main/assembly/descriptor.xml b/opendj-sdk/opendj-ldap-sync/src/main/assembly/descriptor.xml similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sync/src/main/assembly/descriptor.xml rename to opendj-sdk/opendj-ldap-sync/src/main/assembly/descriptor.xml diff --git a/opendj-sdk/opendj3/opendj-ldap-sync/src/main/assembly/libbat/_client-script.bat b/opendj-sdk/opendj-ldap-sync/src/main/assembly/libbat/_client-script.bat similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sync/src/main/assembly/libbat/_client-script.bat rename to opendj-sdk/opendj-ldap-sync/src/main/assembly/libbat/_client-script.bat diff --git a/opendj-sdk/opendj3/opendj-ldap-sync/src/main/assembly/libbat/_script-util.bat b/opendj-sdk/opendj-ldap-sync/src/main/assembly/libbat/_script-util.bat similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sync/src/main/assembly/libbat/_script-util.bat rename to opendj-sdk/opendj-ldap-sync/src/main/assembly/libbat/_script-util.bat diff --git a/opendj-sdk/opendj3/opendj-ldap-sync/src/main/assembly/libbat/setcp.bat b/opendj-sdk/opendj-ldap-sync/src/main/assembly/libbat/setcp.bat similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sync/src/main/assembly/libbat/setcp.bat rename to opendj-sdk/opendj-ldap-sync/src/main/assembly/libbat/setcp.bat diff --git a/opendj-sdk/opendj3/opendj-ldap-sync/src/main/assembly/libbin/_client-script.sh b/opendj-sdk/opendj-ldap-sync/src/main/assembly/libbin/_client-script.sh similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sync/src/main/assembly/libbin/_client-script.sh rename to opendj-sdk/opendj-ldap-sync/src/main/assembly/libbin/_client-script.sh diff --git a/opendj-sdk/opendj3/opendj-ldap-sync/src/main/assembly/libbin/_script-util.sh b/opendj-sdk/opendj-ldap-sync/src/main/assembly/libbin/_script-util.sh similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sync/src/main/assembly/libbin/_script-util.sh rename to opendj-sdk/opendj-ldap-sync/src/main/assembly/libbin/_script-util.sh diff --git a/opendj-sdk/opendj3/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/Main.java b/opendj-sdk/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/Main.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/Main.java rename to opendj-sdk/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/Main.java diff --git a/opendj-sdk/opendj3/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/filters/ChangeRecordContext.java b/opendj-sdk/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/filters/ChangeRecordContext.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/filters/ChangeRecordContext.java rename to opendj-sdk/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/filters/ChangeRecordContext.java diff --git a/opendj-sdk/opendj3/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/filters/Filter.java b/opendj-sdk/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/filters/Filter.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/filters/Filter.java rename to opendj-sdk/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/filters/Filter.java diff --git a/opendj-sdk/opendj3/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/filters/FilterResult.java b/opendj-sdk/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/filters/FilterResult.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/filters/FilterResult.java rename to opendj-sdk/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/filters/FilterResult.java diff --git a/opendj-sdk/opendj3/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/filters/Matchers.java b/opendj-sdk/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/filters/Matchers.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/filters/Matchers.java rename to opendj-sdk/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/filters/Matchers.java diff --git a/opendj-sdk/opendj3/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/filters/Transforms.java b/opendj-sdk/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/filters/Transforms.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/filters/Transforms.java rename to opendj-sdk/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/filters/Transforms.java diff --git a/opendj-sdk/opendj3/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/filters/package-info.java b/opendj-sdk/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/filters/package-info.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/filters/package-info.java rename to opendj-sdk/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/filters/package-info.java diff --git a/opendj-sdk/opendj3/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/package-info.java b/opendj-sdk/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/package-info.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/package-info.java rename to opendj-sdk/opendj-ldap-sync/src/main/java/org/forgerock/opendj/sync/package-info.java diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/README b/opendj-sdk/opendj-ldap-toolkit/README similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/README rename to opendj-sdk/opendj-ldap-toolkit/README diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/pom.xml b/opendj-sdk/opendj-ldap-toolkit/pom.xml similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/pom.xml rename to opendj-sdk/opendj-ldap-toolkit/pom.xml diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bat/authrate.bat b/opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bat/authrate.bat similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bat/authrate.bat rename to opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bat/authrate.bat diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bat/ldapcompare.bat b/opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bat/ldapcompare.bat similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bat/ldapcompare.bat rename to opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bat/ldapcompare.bat diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bat/ldapmodify.bat b/opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bat/ldapmodify.bat similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bat/ldapmodify.bat rename to opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bat/ldapmodify.bat diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bat/ldappasswordmodify.bat b/opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bat/ldappasswordmodify.bat similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bat/ldappasswordmodify.bat rename to opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bat/ldappasswordmodify.bat diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bat/ldapsearch.bat b/opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bat/ldapsearch.bat similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bat/ldapsearch.bat rename to opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bat/ldapsearch.bat diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bat/ldifdiff.bat b/opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bat/ldifdiff.bat similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bat/ldifdiff.bat rename to opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bat/ldifdiff.bat diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bat/ldifmodify.bat b/opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bat/ldifmodify.bat similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bat/ldifmodify.bat rename to opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bat/ldifmodify.bat diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bat/ldifsearch.bat b/opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bat/ldifsearch.bat similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bat/ldifsearch.bat rename to opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bat/ldifsearch.bat diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bat/makeldif.bat b/opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bat/makeldif.bat similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bat/makeldif.bat rename to opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bat/makeldif.bat diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bat/modrate.bat b/opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bat/modrate.bat similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bat/modrate.bat rename to opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bat/modrate.bat diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bat/searchrate.bat b/opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bat/searchrate.bat similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bat/searchrate.bat rename to opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bat/searchrate.bat diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bin/authrate b/opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bin/authrate similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bin/authrate rename to opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bin/authrate diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bin/ldapcompare b/opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bin/ldapcompare similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bin/ldapcompare rename to opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bin/ldapcompare diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bin/ldapmodify b/opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bin/ldapmodify similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bin/ldapmodify rename to opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bin/ldapmodify diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bin/ldappasswordmodify b/opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bin/ldappasswordmodify similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bin/ldappasswordmodify rename to opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bin/ldappasswordmodify diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bin/ldapsearch b/opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bin/ldapsearch similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bin/ldapsearch rename to opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bin/ldapsearch diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bin/ldifdiff b/opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bin/ldifdiff similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bin/ldifdiff rename to opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bin/ldifdiff diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bin/ldifmodify b/opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bin/ldifmodify similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bin/ldifmodify rename to opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bin/ldifmodify diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bin/ldifsearch b/opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bin/ldifsearch similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bin/ldifsearch rename to opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bin/ldifsearch diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bin/makeldif b/opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bin/makeldif similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bin/makeldif rename to opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bin/makeldif diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bin/modrate b/opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bin/modrate similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bin/modrate rename to opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bin/modrate diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bin/searchrate b/opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bin/searchrate similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/bin/searchrate rename to opendj-sdk/opendj-ldap-toolkit/src/main/assembly/bin/searchrate diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/descriptor.xml b/opendj-sdk/opendj-ldap-toolkit/src/main/assembly/descriptor.xml similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/descriptor.xml rename to opendj-sdk/opendj-ldap-toolkit/src/main/assembly/descriptor.xml diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/libbat/_client-script.bat b/opendj-sdk/opendj-ldap-toolkit/src/main/assembly/libbat/_client-script.bat similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/libbat/_client-script.bat rename to opendj-sdk/opendj-ldap-toolkit/src/main/assembly/libbat/_client-script.bat diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/libbat/_script-util.bat b/opendj-sdk/opendj-ldap-toolkit/src/main/assembly/libbat/_script-util.bat similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/libbat/_script-util.bat rename to opendj-sdk/opendj-ldap-toolkit/src/main/assembly/libbat/_script-util.bat diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/libbat/setcp.bat b/opendj-sdk/opendj-ldap-toolkit/src/main/assembly/libbat/setcp.bat similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/libbat/setcp.bat rename to opendj-sdk/opendj-ldap-toolkit/src/main/assembly/libbat/setcp.bat diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/libbin/_client-script.sh b/opendj-sdk/opendj-ldap-toolkit/src/main/assembly/libbin/_client-script.sh similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/libbin/_client-script.sh rename to opendj-sdk/opendj-ldap-toolkit/src/main/assembly/libbin/_client-script.sh diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/libbin/_script-util.sh b/opendj-sdk/opendj-ldap-toolkit/src/main/assembly/libbin/_script-util.sh similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/assembly/libbin/_script-util.sh rename to opendj-sdk/opendj-ldap-toolkit/src/main/assembly/libbin/_script-util.sh diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ApplicationKeyManager.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ApplicationKeyManager.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ApplicationKeyManager.java rename to opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ApplicationKeyManager.java diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/Argument.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/Argument.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/Argument.java rename to opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/Argument.java diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ArgumentException.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ArgumentException.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ArgumentException.java rename to opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ArgumentException.java diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ArgumentGroup.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ArgumentGroup.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ArgumentGroup.java rename to opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ArgumentGroup.java diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ArgumentParser.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ArgumentParser.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ArgumentParser.java rename to opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ArgumentParser.java diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java rename to opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthenticatedConnectionFactory.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthenticatedConnectionFactory.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthenticatedConnectionFactory.java rename to opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthenticatedConnectionFactory.java diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/BooleanArgument.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/BooleanArgument.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/BooleanArgument.java rename to opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/BooleanArgument.java diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/CLIException.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/CLIException.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/CLIException.java rename to opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/CLIException.java diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ConnectionFactoryProvider.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ConnectionFactoryProvider.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ConnectionFactoryProvider.java rename to opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ConnectionFactoryProvider.java diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ConsoleApplication.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ConsoleApplication.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ConsoleApplication.java rename to opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ConsoleApplication.java diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/DataSource.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/DataSource.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/DataSource.java rename to opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/DataSource.java diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/FileBasedArgument.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/FileBasedArgument.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/FileBasedArgument.java rename to opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/FileBasedArgument.java diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/IntegerArgument.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/IntegerArgument.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/IntegerArgument.java rename to opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/IntegerArgument.java diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java rename to opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java rename to opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java rename to opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java rename to opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFDiff.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFDiff.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFDiff.java rename to opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFDiff.java diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFModify.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFModify.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFModify.java rename to opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFModify.java diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java rename to opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java rename to opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ModRate.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ModRate.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ModRate.java rename to opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ModRate.java diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MultiChoiceArgument.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MultiChoiceArgument.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MultiChoiceArgument.java rename to opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MultiChoiceArgument.java diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MultiColumnPrinter.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MultiColumnPrinter.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MultiColumnPrinter.java rename to opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MultiColumnPrinter.java diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java rename to opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PromptingTrustManager.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PromptingTrustManager.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PromptingTrustManager.java rename to opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PromptingTrustManager.java diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java rename to opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/StringArgument.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/StringArgument.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/StringArgument.java rename to opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/StringArgument.java diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ToolConstants.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ToolConstants.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ToolConstants.java rename to opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ToolConstants.java diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/Utils.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/Utils.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/Utils.java rename to opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/Utils.java diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/package-info.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/package-info.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/package-info.java rename to opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/package-info.java diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties b/opendj-sdk/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties rename to opendj-sdk/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_de.properties b/opendj-sdk/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_de.properties similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_de.properties rename to opendj-sdk/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_de.properties diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_es.properties b/opendj-sdk/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_es.properties similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_es.properties rename to opendj-sdk/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_es.properties diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_fr.properties b/opendj-sdk/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_fr.properties similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_fr.properties rename to opendj-sdk/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_fr.properties diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_ja.properties b/opendj-sdk/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_ja.properties similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_ja.properties rename to opendj-sdk/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_ja.properties diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_ko.properties b/opendj-sdk/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_ko.properties similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_ko.properties rename to opendj-sdk/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_ko.properties diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_zh_CN.properties b/opendj-sdk/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_zh_CN.properties similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_zh_CN.properties rename to opendj-sdk/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_zh_CN.properties diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_zh_TW.properties b/opendj-sdk/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_zh_TW.properties similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_zh_TW.properties rename to opendj-sdk/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_zh_TW.properties diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/site/site.xml b/opendj-sdk/opendj-ldap-toolkit/src/site/site.xml similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/site/site.xml rename to opendj-sdk/opendj-ldap-toolkit/src/site/site.xml diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/site/xdoc/index.xml.vm b/opendj-sdk/opendj-ldap-toolkit/src/site/xdoc/index.xml.vm similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/site/xdoc/index.xml.vm rename to opendj-sdk/opendj-ldap-toolkit/src/site/xdoc/index.xml.vm diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ConnectionFactoryProviderTest.java b/opendj-sdk/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ConnectionFactoryProviderTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ConnectionFactoryProviderTest.java rename to opendj-sdk/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ConnectionFactoryProviderTest.java diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFTestCase.java b/opendj-sdk/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFTestCase.java rename to opendj-sdk/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFTestCase.java diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ToolsTestCase.java b/opendj-sdk/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ToolsTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ToolsTestCase.java rename to opendj-sdk/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ToolsTestCase.java diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/test/resources/dummy-truststore b/opendj-sdk/opendj-ldap-toolkit/src/test/resources/dummy-truststore similarity index 100% rename from opendj-sdk/opendj3/opendj-ldap-toolkit/src/test/resources/dummy-truststore rename to opendj-sdk/opendj-ldap-toolkit/src/test/resources/dummy-truststore Binary files differ diff --git a/opendj-sdk/opendj3/opendj-logo.png b/opendj-sdk/opendj-logo.png similarity index 100% rename from opendj-sdk/opendj3/opendj-logo.png rename to opendj-sdk/opendj-logo.png Binary files differ diff --git a/opendj-sdk/opendj3/opendj-rest2ldap-servlet/pom.xml b/opendj-sdk/opendj-rest2ldap-servlet/pom.xml similarity index 100% rename from opendj-sdk/opendj3/opendj-rest2ldap-servlet/pom.xml rename to opendj-sdk/opendj-rest2ldap-servlet/pom.xml diff --git a/opendj-sdk/opendj3/opendj-rest2ldap-servlet/src/main/java/org/forgerock/opendj/rest2ldap/servlet/Rest2LDAPAuthnFilter.java b/opendj-sdk/opendj-rest2ldap-servlet/src/main/java/org/forgerock/opendj/rest2ldap/servlet/Rest2LDAPAuthnFilter.java similarity index 100% rename from opendj-sdk/opendj3/opendj-rest2ldap-servlet/src/main/java/org/forgerock/opendj/rest2ldap/servlet/Rest2LDAPAuthnFilter.java rename to opendj-sdk/opendj-rest2ldap-servlet/src/main/java/org/forgerock/opendj/rest2ldap/servlet/Rest2LDAPAuthnFilter.java diff --git a/opendj-sdk/opendj3/opendj-rest2ldap-servlet/src/main/java/org/forgerock/opendj/rest2ldap/servlet/Rest2LDAPConnectionFactoryProvider.java b/opendj-sdk/opendj-rest2ldap-servlet/src/main/java/org/forgerock/opendj/rest2ldap/servlet/Rest2LDAPConnectionFactoryProvider.java similarity index 100% rename from opendj-sdk/opendj3/opendj-rest2ldap-servlet/src/main/java/org/forgerock/opendj/rest2ldap/servlet/Rest2LDAPConnectionFactoryProvider.java rename to opendj-sdk/opendj-rest2ldap-servlet/src/main/java/org/forgerock/opendj/rest2ldap/servlet/Rest2LDAPConnectionFactoryProvider.java diff --git a/opendj-sdk/opendj3/opendj-rest2ldap-servlet/src/main/java/org/forgerock/opendj/rest2ldap/servlet/Rest2LDAPContextFactory.java b/opendj-sdk/opendj-rest2ldap-servlet/src/main/java/org/forgerock/opendj/rest2ldap/servlet/Rest2LDAPContextFactory.java similarity index 100% rename from opendj-sdk/opendj3/opendj-rest2ldap-servlet/src/main/java/org/forgerock/opendj/rest2ldap/servlet/Rest2LDAPContextFactory.java rename to opendj-sdk/opendj-rest2ldap-servlet/src/main/java/org/forgerock/opendj/rest2ldap/servlet/Rest2LDAPContextFactory.java diff --git a/opendj-sdk/opendj3/opendj-rest2ldap-servlet/src/main/java/org/forgerock/opendj/rest2ldap/servlet/package-info.java b/opendj-sdk/opendj-rest2ldap-servlet/src/main/java/org/forgerock/opendj/rest2ldap/servlet/package-info.java similarity index 100% rename from opendj-sdk/opendj3/opendj-rest2ldap-servlet/src/main/java/org/forgerock/opendj/rest2ldap/servlet/package-info.java rename to opendj-sdk/opendj-rest2ldap-servlet/src/main/java/org/forgerock/opendj/rest2ldap/servlet/package-info.java diff --git a/opendj-sdk/opendj3/opendj-rest2ldap-servlet/src/main/webapp/WEB-INF/web.xml b/opendj-sdk/opendj-rest2ldap-servlet/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from opendj-sdk/opendj3/opendj-rest2ldap-servlet/src/main/webapp/WEB-INF/web.xml rename to opendj-sdk/opendj-rest2ldap-servlet/src/main/webapp/WEB-INF/web.xml diff --git a/opendj-sdk/opendj3/opendj-rest2ldap-servlet/src/main/webapp/opendj-rest2ldap-servlet.json b/opendj-sdk/opendj-rest2ldap-servlet/src/main/webapp/opendj-rest2ldap-servlet.json similarity index 100% rename from opendj-sdk/opendj3/opendj-rest2ldap-servlet/src/main/webapp/opendj-rest2ldap-servlet.json rename to opendj-sdk/opendj-rest2ldap-servlet/src/main/webapp/opendj-rest2ldap-servlet.json diff --git a/opendj-sdk/opendj3/opendj-rest2ldap/README b/opendj-sdk/opendj-rest2ldap/README similarity index 100% rename from opendj-sdk/opendj3/opendj-rest2ldap/README rename to opendj-sdk/opendj-rest2ldap/README diff --git a/opendj-sdk/opendj3/opendj-rest2ldap/pom.xml b/opendj-sdk/opendj-rest2ldap/pom.xml similarity index 100% rename from opendj-sdk/opendj3/opendj-rest2ldap/pom.xml rename to opendj-sdk/opendj-rest2ldap/pom.xml diff --git a/opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AbstractLDAPAttributeMapper.java b/opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AbstractLDAPAttributeMapper.java similarity index 100% rename from opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AbstractLDAPAttributeMapper.java rename to opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AbstractLDAPAttributeMapper.java diff --git a/opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AttributeMapper.java b/opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AttributeMapper.java similarity index 100% rename from opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AttributeMapper.java rename to opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AttributeMapper.java diff --git a/opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AuthenticatedConnectionContext.java b/opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AuthenticatedConnectionContext.java similarity index 100% rename from opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AuthenticatedConnectionContext.java rename to opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AuthenticatedConnectionContext.java diff --git a/opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AuthorizationPolicy.java b/opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AuthorizationPolicy.java similarity index 100% rename from opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AuthorizationPolicy.java rename to opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AuthorizationPolicy.java diff --git a/opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AuthzIdTemplate.java b/opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AuthzIdTemplate.java similarity index 100% rename from opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AuthzIdTemplate.java rename to opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AuthzIdTemplate.java diff --git a/opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Config.java b/opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Config.java similarity index 100% rename from opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Config.java rename to opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Config.java diff --git a/opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Context.java b/opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Context.java similarity index 100% rename from opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Context.java rename to opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Context.java diff --git a/opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/FilterType.java b/opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/FilterType.java similarity index 100% rename from opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/FilterType.java rename to opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/FilterType.java diff --git a/opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/JSONConstantAttributeMapper.java b/opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/JSONConstantAttributeMapper.java similarity index 100% rename from opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/JSONConstantAttributeMapper.java rename to opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/JSONConstantAttributeMapper.java diff --git a/opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/LDAPCollectionResourceProvider.java b/opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/LDAPCollectionResourceProvider.java similarity index 100% rename from opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/LDAPCollectionResourceProvider.java rename to opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/LDAPCollectionResourceProvider.java diff --git a/opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/NameStrategy.java b/opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/NameStrategy.java similarity index 100% rename from opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/NameStrategy.java rename to opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/NameStrategy.java diff --git a/opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ObjectAttributeMapper.java b/opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ObjectAttributeMapper.java similarity index 100% rename from opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ObjectAttributeMapper.java rename to opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ObjectAttributeMapper.java diff --git a/opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ReadOnUpdatePolicy.java b/opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ReadOnUpdatePolicy.java similarity index 100% rename from opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ReadOnUpdatePolicy.java rename to opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ReadOnUpdatePolicy.java diff --git a/opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ReferenceAttributeMapper.java b/opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ReferenceAttributeMapper.java similarity index 100% rename from opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ReferenceAttributeMapper.java rename to opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ReferenceAttributeMapper.java diff --git a/opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java b/opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java similarity index 100% rename from opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java rename to opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java diff --git a/opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SimpleAttributeMapper.java b/opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SimpleAttributeMapper.java similarity index 100% rename from opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SimpleAttributeMapper.java rename to opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SimpleAttributeMapper.java diff --git a/opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Utils.java b/opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Utils.java similarity index 100% rename from opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Utils.java rename to opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Utils.java diff --git a/opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/WritabilityPolicy.java b/opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/WritabilityPolicy.java similarity index 100% rename from opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/WritabilityPolicy.java rename to opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/WritabilityPolicy.java diff --git a/opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/package-info.java b/opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/package-info.java similarity index 100% rename from opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/package-info.java rename to opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/package-info.java diff --git a/opendj-sdk/opendj3/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/AuthzIdTemplateTest.java b/opendj-sdk/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/AuthzIdTemplateTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/AuthzIdTemplateTest.java rename to opendj-sdk/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/AuthzIdTemplateTest.java diff --git a/opendj-sdk/opendj3/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/BasicRequestsTest.java b/opendj-sdk/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/BasicRequestsTest.java similarity index 100% rename from opendj-sdk/opendj3/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/BasicRequestsTest.java rename to opendj-sdk/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/BasicRequestsTest.java diff --git a/opendj-sdk/opendj3/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/TestUtils.java b/opendj-sdk/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/TestUtils.java similarity index 100% rename from opendj-sdk/opendj3/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/TestUtils.java rename to opendj-sdk/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/TestUtils.java diff --git a/opendj-sdk/opendj3/opendj-server2x-adapter/pom.xml b/opendj-sdk/opendj-server2x-adapter/pom.xml similarity index 100% rename from opendj-sdk/opendj3/opendj-server2x-adapter/pom.xml rename to opendj-sdk/opendj-server2x-adapter/pom.xml diff --git a/opendj-sdk/opendj3/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Adapters.java b/opendj-sdk/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Adapters.java similarity index 100% rename from opendj-sdk/opendj3/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Adapters.java rename to opendj-sdk/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Adapters.java diff --git a/opendj-sdk/opendj3/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Converters.java b/opendj-sdk/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Converters.java similarity index 100% rename from opendj-sdk/opendj3/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Converters.java rename to opendj-sdk/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Converters.java diff --git a/opendj-sdk/opendj3/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/package-info.java b/opendj-sdk/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/package-info.java similarity index 100% rename from opendj-sdk/opendj3/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/package-info.java rename to opendj-sdk/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/package-info.java diff --git a/opendj-sdk/opendj3/opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/AdaptersTestCase.java b/opendj-sdk/opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/AdaptersTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/AdaptersTestCase.java rename to opendj-sdk/opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/AdaptersTestCase.java diff --git a/opendj-sdk/opendj3/opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/ConvertersTestCase.java b/opendj-sdk/opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/ConvertersTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/ConvertersTestCase.java rename to opendj-sdk/opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/ConvertersTestCase.java diff --git a/opendj-sdk/opendj3/opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/EmbeddedServerTestCaseUtils.java b/opendj-sdk/opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/EmbeddedServerTestCaseUtils.java similarity index 100% rename from opendj-sdk/opendj3/opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/EmbeddedServerTestCaseUtils.java rename to opendj-sdk/opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/EmbeddedServerTestCaseUtils.java diff --git a/opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/config/admin-backend.ldif b/opendj-sdk/opendj-server2x-adapter/src/test/resources/config/admin-backend.ldif similarity index 100% rename from opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/config/admin-backend.ldif rename to opendj-sdk/opendj-server2x-adapter/src/test/resources/config/admin-backend.ldif diff --git a/opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/config/admin-keystore b/opendj-sdk/opendj-server2x-adapter/src/test/resources/config/admin-keystore similarity index 100% rename from opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/config/admin-keystore rename to opendj-sdk/opendj-server2x-adapter/src/test/resources/config/admin-keystore Binary files differ diff --git a/opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/config/admin-keystore.pin b/opendj-sdk/opendj-server2x-adapter/src/test/resources/config/admin-keystore.pin similarity index 100% rename from opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/config/admin-keystore.pin rename to opendj-sdk/opendj-server2x-adapter/src/test/resources/config/admin-keystore.pin diff --git a/opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/config/admin-truststore b/opendj-sdk/opendj-server2x-adapter/src/test/resources/config/admin-truststore similarity index 100% rename from opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/config/admin-truststore rename to opendj-sdk/opendj-server2x-adapter/src/test/resources/config/admin-truststore Binary files differ diff --git a/opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/config/ads-truststore b/opendj-sdk/opendj-server2x-adapter/src/test/resources/config/ads-truststore similarity index 100% rename from opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/config/ads-truststore rename to opendj-sdk/opendj-server2x-adapter/src/test/resources/config/ads-truststore Binary files differ diff --git a/opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/config/ads-truststore.pin b/opendj-sdk/opendj-server2x-adapter/src/test/resources/config/ads-truststore.pin similarity index 100% rename from opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/config/ads-truststore.pin rename to opendj-sdk/opendj-server2x-adapter/src/test/resources/config/ads-truststore.pin diff --git a/opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/config/config.ldif b/opendj-sdk/opendj-server2x-adapter/src/test/resources/config/config.ldif similarity index 100% rename from opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/config/config.ldif rename to opendj-sdk/opendj-server2x-adapter/src/test/resources/config/config.ldif diff --git a/opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/config/config.properties b/opendj-sdk/opendj-server2x-adapter/src/test/resources/config/config.properties similarity index 100% rename from opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/config/config.properties rename to opendj-sdk/opendj-server2x-adapter/src/test/resources/config/config.properties diff --git a/opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/config/schema/00-core.ldif b/opendj-sdk/opendj-server2x-adapter/src/test/resources/config/schema/00-core.ldif similarity index 100% rename from opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/config/schema/00-core.ldif rename to opendj-sdk/opendj-server2x-adapter/src/test/resources/config/schema/00-core.ldif diff --git a/opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/config/schema/01-pwpolicy.ldif b/opendj-sdk/opendj-server2x-adapter/src/test/resources/config/schema/01-pwpolicy.ldif similarity index 100% rename from opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/config/schema/01-pwpolicy.ldif rename to opendj-sdk/opendj-server2x-adapter/src/test/resources/config/schema/01-pwpolicy.ldif diff --git a/opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/config/schema/02-config.ldif b/opendj-sdk/opendj-server2x-adapter/src/test/resources/config/schema/02-config.ldif similarity index 100% rename from opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/config/schema/02-config.ldif rename to opendj-sdk/opendj-server2x-adapter/src/test/resources/config/schema/02-config.ldif diff --git a/opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/config/schema/04-rfc2307bis.ldif b/opendj-sdk/opendj-server2x-adapter/src/test/resources/config/schema/04-rfc2307bis.ldif similarity index 100% rename from opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/config/schema/04-rfc2307bis.ldif rename to opendj-sdk/opendj-server2x-adapter/src/test/resources/config/schema/04-rfc2307bis.ldif diff --git a/opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/config/tasks.ldif b/opendj-sdk/opendj-server2x-adapter/src/test/resources/config/tasks.ldif similarity index 100% rename from opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/config/tasks.ldif rename to opendj-sdk/opendj-server2x-adapter/src/test/resources/config/tasks.ldif diff --git a/opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/locks/backend-adminRoot.lock b/opendj-sdk/opendj-server2x-adapter/src/test/resources/locks/backend-adminRoot.lock similarity index 100% rename from opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/locks/backend-adminRoot.lock rename to opendj-sdk/opendj-server2x-adapter/src/test/resources/locks/backend-adminRoot.lock diff --git a/opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/locks/backend-ads-truststore.lock b/opendj-sdk/opendj-server2x-adapter/src/test/resources/locks/backend-ads-truststore.lock similarity index 100% rename from opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/locks/backend-ads-truststore.lock rename to opendj-sdk/opendj-server2x-adapter/src/test/resources/locks/backend-ads-truststore.lock diff --git a/opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/locks/backend-backup.lock b/opendj-sdk/opendj-server2x-adapter/src/test/resources/locks/backend-backup.lock similarity index 100% rename from opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/locks/backend-backup.lock rename to opendj-sdk/opendj-server2x-adapter/src/test/resources/locks/backend-backup.lock diff --git a/opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/locks/backend-monitor.lock b/opendj-sdk/opendj-server2x-adapter/src/test/resources/locks/backend-monitor.lock similarity index 100% rename from opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/locks/backend-monitor.lock rename to opendj-sdk/opendj-server2x-adapter/src/test/resources/locks/backend-monitor.lock diff --git a/opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/locks/backend-schema.lock b/opendj-sdk/opendj-server2x-adapter/src/test/resources/locks/backend-schema.lock similarity index 100% rename from opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/locks/backend-schema.lock rename to opendj-sdk/opendj-server2x-adapter/src/test/resources/locks/backend-schema.lock diff --git a/opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/locks/backend-tasks.lock b/opendj-sdk/opendj-server2x-adapter/src/test/resources/locks/backend-tasks.lock similarity index 100% rename from opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/locks/backend-tasks.lock rename to opendj-sdk/opendj-server2x-adapter/src/test/resources/locks/backend-tasks.lock diff --git a/opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/locks/backend-userRoot.lock b/opendj-sdk/opendj-server2x-adapter/src/test/resources/locks/backend-userRoot.lock similarity index 100% rename from opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/locks/backend-userRoot.lock rename to opendj-sdk/opendj-server2x-adapter/src/test/resources/locks/backend-userRoot.lock diff --git a/opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/locks/server.lock b/opendj-sdk/opendj-server2x-adapter/src/test/resources/locks/server.lock similarity index 100% rename from opendj-sdk/opendj3/opendj-server2x-adapter/src/test/resources/locks/server.lock rename to opendj-sdk/opendj-server2x-adapter/src/test/resources/locks/server.lock diff --git a/opendj-sdk/opendj3/opendj-virtual/MappingConfig.properties b/opendj-sdk/opendj-virtual/MappingConfig.properties similarity index 100% rename from opendj-sdk/opendj3/opendj-virtual/MappingConfig.properties rename to opendj-sdk/opendj-virtual/MappingConfig.properties diff --git a/opendj-sdk/opendj3/opendj-virtual/README b/opendj-sdk/opendj-virtual/README similarity index 100% rename from opendj-sdk/opendj3/opendj-virtual/README rename to opendj-sdk/opendj-virtual/README diff --git a/opendj-sdk/opendj3/opendj-virtual/pom.xml b/opendj-sdk/opendj-virtual/pom.xml similarity index 100% rename from opendj-sdk/opendj3/opendj-virtual/pom.xml rename to opendj-sdk/opendj-virtual/pom.xml diff --git a/opendj-sdk/opendj3/opendj-virtual/src/main/java/org/forgerock/opendj/virtual/JDBCConnection.java b/opendj-sdk/opendj-virtual/src/main/java/org/forgerock/opendj/virtual/JDBCConnection.java similarity index 100% rename from opendj-sdk/opendj3/opendj-virtual/src/main/java/org/forgerock/opendj/virtual/JDBCConnection.java rename to opendj-sdk/opendj-virtual/src/main/java/org/forgerock/opendj/virtual/JDBCConnection.java diff --git a/opendj-sdk/opendj3/opendj-virtual/src/main/java/org/forgerock/opendj/virtual/JDBCConnectionFactory.java b/opendj-sdk/opendj-virtual/src/main/java/org/forgerock/opendj/virtual/JDBCConnectionFactory.java similarity index 100% rename from opendj-sdk/opendj3/opendj-virtual/src/main/java/org/forgerock/opendj/virtual/JDBCConnectionFactory.java rename to opendj-sdk/opendj-virtual/src/main/java/org/forgerock/opendj/virtual/JDBCConnectionFactory.java diff --git a/opendj-sdk/opendj3/opendj-virtual/src/main/java/org/forgerock/opendj/virtual/JDBCMapper.java b/opendj-sdk/opendj-virtual/src/main/java/org/forgerock/opendj/virtual/JDBCMapper.java similarity index 100% rename from opendj-sdk/opendj3/opendj-virtual/src/main/java/org/forgerock/opendj/virtual/JDBCMapper.java rename to opendj-sdk/opendj-virtual/src/main/java/org/forgerock/opendj/virtual/JDBCMapper.java diff --git a/opendj-sdk/opendj3/opendj-virtual/src/main/java/org/forgerock/opendj/virtual/JoinConnection.java b/opendj-sdk/opendj-virtual/src/main/java/org/forgerock/opendj/virtual/JoinConnection.java similarity index 100% rename from opendj-sdk/opendj3/opendj-virtual/src/main/java/org/forgerock/opendj/virtual/JoinConnection.java rename to opendj-sdk/opendj-virtual/src/main/java/org/forgerock/opendj/virtual/JoinConnection.java diff --git a/opendj-sdk/opendj3/opendj-virtual/src/main/java/org/forgerock/opendj/virtual/JoinConnectionFactory.java b/opendj-sdk/opendj-virtual/src/main/java/org/forgerock/opendj/virtual/JoinConnectionFactory.java similarity index 100% rename from opendj-sdk/opendj3/opendj-virtual/src/main/java/org/forgerock/opendj/virtual/JoinConnectionFactory.java rename to opendj-sdk/opendj-virtual/src/main/java/org/forgerock/opendj/virtual/JoinConnectionFactory.java diff --git a/opendj-sdk/opendj3/opendj-virtual/src/main/java/org/forgerock/opendj/virtual/MappingConfigurationManager.java b/opendj-sdk/opendj-virtual/src/main/java/org/forgerock/opendj/virtual/MappingConfigurationManager.java similarity index 100% rename from opendj-sdk/opendj3/opendj-virtual/src/main/java/org/forgerock/opendj/virtual/MappingConfigurationManager.java rename to opendj-sdk/opendj-virtual/src/main/java/org/forgerock/opendj/virtual/MappingConfigurationManager.java diff --git a/opendj-sdk/opendj3/opendj-virtual/src/main/java/org/forgerock/opendj/virtual/TestUpdate.class b/opendj-sdk/opendj-virtual/src/main/java/org/forgerock/opendj/virtual/TestUpdate.class similarity index 100% rename from opendj-sdk/opendj3/opendj-virtual/src/main/java/org/forgerock/opendj/virtual/TestUpdate.class rename to opendj-sdk/opendj-virtual/src/main/java/org/forgerock/opendj/virtual/TestUpdate.class Binary files differ diff --git a/opendj-sdk/opendj3/opendj-virtual/src/test/java/org/forgerock/opendj/virtual/AddRequestTestCase.java b/opendj-sdk/opendj-virtual/src/test/java/org/forgerock/opendj/virtual/AddRequestTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-virtual/src/test/java/org/forgerock/opendj/virtual/AddRequestTestCase.java rename to opendj-sdk/opendj-virtual/src/test/java/org/forgerock/opendj/virtual/AddRequestTestCase.java diff --git a/opendj-sdk/opendj3/opendj-virtual/src/test/java/org/forgerock/opendj/virtual/JDBCConnectionTestCase.java b/opendj-sdk/opendj-virtual/src/test/java/org/forgerock/opendj/virtual/JDBCConnectionTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-virtual/src/test/java/org/forgerock/opendj/virtual/JDBCConnectionTestCase.java rename to opendj-sdk/opendj-virtual/src/test/java/org/forgerock/opendj/virtual/JDBCConnectionTestCase.java diff --git a/opendj-sdk/opendj3/opendj-virtual/src/test/java/org/forgerock/opendj/virtual/JDBCMapperTestCase.java b/opendj-sdk/opendj-virtual/src/test/java/org/forgerock/opendj/virtual/JDBCMapperTestCase.java similarity index 100% rename from opendj-sdk/opendj3/opendj-virtual/src/test/java/org/forgerock/opendj/virtual/JDBCMapperTestCase.java rename to opendj-sdk/opendj-virtual/src/test/java/org/forgerock/opendj/virtual/JDBCMapperTestCase.java diff --git a/opendj-sdk/opendj3/pom.xml b/opendj-sdk/pom.xml similarity index 100% rename from opendj-sdk/opendj3/pom.xml rename to opendj-sdk/pom.xml diff --git a/opendj-sdk/opendj3/src/main/docbkx/README.txt b/opendj-sdk/src/main/docbkx/README.txt similarity index 100% rename from opendj-sdk/opendj3/src/main/docbkx/README.txt rename to opendj-sdk/src/main/docbkx/README.txt diff --git a/opendj-sdk/opendj3/src/main/docbkx/dev-guide/chap-authenticating.xml b/opendj-sdk/src/main/docbkx/dev-guide/chap-authenticating.xml similarity index 100% rename from opendj-sdk/opendj3/src/main/docbkx/dev-guide/chap-authenticating.xml rename to opendj-sdk/src/main/docbkx/dev-guide/chap-authenticating.xml diff --git a/opendj-sdk/opendj3/src/main/docbkx/dev-guide/chap-best-practices.xml b/opendj-sdk/src/main/docbkx/dev-guide/chap-best-practices.xml similarity index 100% rename from opendj-sdk/opendj3/src/main/docbkx/dev-guide/chap-best-practices.xml rename to opendj-sdk/src/main/docbkx/dev-guide/chap-best-practices.xml diff --git a/opendj-sdk/opendj3/src/main/docbkx/dev-guide/chap-controls.xml b/opendj-sdk/src/main/docbkx/dev-guide/chap-controls.xml similarity index 100% rename from opendj-sdk/opendj3/src/main/docbkx/dev-guide/chap-controls.xml rename to opendj-sdk/src/main/docbkx/dev-guide/chap-controls.xml diff --git a/opendj-sdk/opendj3/src/main/docbkx/dev-guide/chap-extended-ops.xml b/opendj-sdk/src/main/docbkx/dev-guide/chap-extended-ops.xml similarity index 100% rename from opendj-sdk/opendj3/src/main/docbkx/dev-guide/chap-extended-ops.xml rename to opendj-sdk/src/main/docbkx/dev-guide/chap-extended-ops.xml diff --git a/opendj-sdk/opendj3/src/main/docbkx/dev-guide/chap-get-sdk.xml b/opendj-sdk/src/main/docbkx/dev-guide/chap-get-sdk.xml similarity index 100% rename from opendj-sdk/opendj3/src/main/docbkx/dev-guide/chap-get-sdk.xml rename to opendj-sdk/src/main/docbkx/dev-guide/chap-get-sdk.xml diff --git a/opendj-sdk/opendj3/src/main/docbkx/dev-guide/chap-getting-directory-info.xml b/opendj-sdk/src/main/docbkx/dev-guide/chap-getting-directory-info.xml similarity index 100% rename from opendj-sdk/opendj3/src/main/docbkx/dev-guide/chap-getting-directory-info.xml rename to opendj-sdk/src/main/docbkx/dev-guide/chap-getting-directory-info.xml diff --git a/opendj-sdk/opendj3/src/main/docbkx/dev-guide/chap-i18n.xml b/opendj-sdk/src/main/docbkx/dev-guide/chap-i18n.xml similarity index 100% rename from opendj-sdk/opendj3/src/main/docbkx/dev-guide/chap-i18n.xml rename to opendj-sdk/src/main/docbkx/dev-guide/chap-i18n.xml diff --git a/opendj-sdk/opendj3/src/main/docbkx/dev-guide/chap-ldif.xml b/opendj-sdk/src/main/docbkx/dev-guide/chap-ldif.xml similarity index 100% rename from opendj-sdk/opendj3/src/main/docbkx/dev-guide/chap-ldif.xml rename to opendj-sdk/src/main/docbkx/dev-guide/chap-ldif.xml diff --git a/opendj-sdk/opendj3/src/main/docbkx/dev-guide/chap-reading.xml b/opendj-sdk/src/main/docbkx/dev-guide/chap-reading.xml similarity index 100% rename from opendj-sdk/opendj3/src/main/docbkx/dev-guide/chap-reading.xml rename to opendj-sdk/src/main/docbkx/dev-guide/chap-reading.xml diff --git a/opendj-sdk/opendj3/src/main/docbkx/dev-guide/chap-simple-proxy.xml b/opendj-sdk/src/main/docbkx/dev-guide/chap-simple-proxy.xml similarity index 100% rename from opendj-sdk/opendj3/src/main/docbkx/dev-guide/chap-simple-proxy.xml rename to opendj-sdk/src/main/docbkx/dev-guide/chap-simple-proxy.xml diff --git a/opendj-sdk/opendj3/src/main/docbkx/dev-guide/chap-understanding-ldap.xml b/opendj-sdk/src/main/docbkx/dev-guide/chap-understanding-ldap.xml similarity index 100% rename from opendj-sdk/opendj3/src/main/docbkx/dev-guide/chap-understanding-ldap.xml rename to opendj-sdk/src/main/docbkx/dev-guide/chap-understanding-ldap.xml diff --git a/opendj-sdk/opendj3/src/main/docbkx/dev-guide/chap-using-the-sdk.xml b/opendj-sdk/src/main/docbkx/dev-guide/chap-using-the-sdk.xml similarity index 100% rename from opendj-sdk/opendj3/src/main/docbkx/dev-guide/chap-using-the-sdk.xml rename to opendj-sdk/src/main/docbkx/dev-guide/chap-using-the-sdk.xml diff --git a/opendj-sdk/opendj3/src/main/docbkx/dev-guide/chap-writing.xml b/opendj-sdk/src/main/docbkx/dev-guide/chap-writing.xml similarity index 100% rename from opendj-sdk/opendj3/src/main/docbkx/dev-guide/chap-writing.xml rename to opendj-sdk/src/main/docbkx/dev-guide/chap-writing.xml diff --git a/opendj-sdk/opendj3/src/main/docbkx/dev-guide/images/data-organization.png b/opendj-sdk/src/main/docbkx/dev-guide/images/data-organization.png similarity index 100% rename from opendj-sdk/opendj3/src/main/docbkx/dev-guide/images/data-organization.png rename to opendj-sdk/src/main/docbkx/dev-guide/images/data-organization.png Binary files differ diff --git a/opendj-sdk/opendj3/src/main/docbkx/dev-guide/images/ldap-tree.png b/opendj-sdk/src/main/docbkx/dev-guide/images/ldap-tree.png similarity index 100% rename from opendj-sdk/opendj3/src/main/docbkx/dev-guide/images/ldap-tree.png rename to opendj-sdk/src/main/docbkx/dev-guide/images/ldap-tree.png Binary files differ diff --git a/opendj-sdk/opendj3/src/main/docbkx/dev-guide/index.xml b/opendj-sdk/src/main/docbkx/dev-guide/index.xml similarity index 100% rename from opendj-sdk/opendj3/src/main/docbkx/dev-guide/index.xml rename to opendj-sdk/src/main/docbkx/dev-guide/index.xml diff --git a/opendj-sdk/opendj3/src/main/docbkx/dev-guide/man-authrate.xml b/opendj-sdk/src/main/docbkx/dev-guide/man-authrate.xml similarity index 100% rename from opendj-sdk/opendj3/src/main/docbkx/dev-guide/man-authrate.xml rename to opendj-sdk/src/main/docbkx/dev-guide/man-authrate.xml diff --git a/opendj-sdk/opendj3/src/main/docbkx/dev-guide/man-ldapcompare.xml b/opendj-sdk/src/main/docbkx/dev-guide/man-ldapcompare.xml similarity index 100% rename from opendj-sdk/opendj3/src/main/docbkx/dev-guide/man-ldapcompare.xml rename to opendj-sdk/src/main/docbkx/dev-guide/man-ldapcompare.xml diff --git a/opendj-sdk/opendj3/src/main/docbkx/dev-guide/man-ldapmodify.xml b/opendj-sdk/src/main/docbkx/dev-guide/man-ldapmodify.xml similarity index 100% rename from opendj-sdk/opendj3/src/main/docbkx/dev-guide/man-ldapmodify.xml rename to opendj-sdk/src/main/docbkx/dev-guide/man-ldapmodify.xml diff --git a/opendj-sdk/opendj3/src/main/docbkx/dev-guide/man-ldappasswordmodify.xml b/opendj-sdk/src/main/docbkx/dev-guide/man-ldappasswordmodify.xml similarity index 100% rename from opendj-sdk/opendj3/src/main/docbkx/dev-guide/man-ldappasswordmodify.xml rename to opendj-sdk/src/main/docbkx/dev-guide/man-ldappasswordmodify.xml diff --git a/opendj-sdk/opendj3/src/main/docbkx/dev-guide/man-ldapsearch.xml b/opendj-sdk/src/main/docbkx/dev-guide/man-ldapsearch.xml similarity index 100% rename from opendj-sdk/opendj3/src/main/docbkx/dev-guide/man-ldapsearch.xml rename to opendj-sdk/src/main/docbkx/dev-guide/man-ldapsearch.xml diff --git a/opendj-sdk/opendj3/src/main/docbkx/dev-guide/man-ldifdiff.xml b/opendj-sdk/src/main/docbkx/dev-guide/man-ldifdiff.xml similarity index 100% rename from opendj-sdk/opendj3/src/main/docbkx/dev-guide/man-ldifdiff.xml rename to opendj-sdk/src/main/docbkx/dev-guide/man-ldifdiff.xml diff --git a/opendj-sdk/opendj3/src/main/docbkx/dev-guide/man-ldifmodify.xml b/opendj-sdk/src/main/docbkx/dev-guide/man-ldifmodify.xml similarity index 100% rename from opendj-sdk/opendj3/src/main/docbkx/dev-guide/man-ldifmodify.xml rename to opendj-sdk/src/main/docbkx/dev-guide/man-ldifmodify.xml diff --git a/opendj-sdk/opendj3/src/main/docbkx/dev-guide/man-ldifsearch.xml b/opendj-sdk/src/main/docbkx/dev-guide/man-ldifsearch.xml similarity index 100% rename from opendj-sdk/opendj3/src/main/docbkx/dev-guide/man-ldifsearch.xml rename to opendj-sdk/src/main/docbkx/dev-guide/man-ldifsearch.xml diff --git a/opendj-sdk/opendj3/src/main/docbkx/dev-guide/man-modrate.xml b/opendj-sdk/src/main/docbkx/dev-guide/man-modrate.xml similarity index 100% rename from opendj-sdk/opendj3/src/main/docbkx/dev-guide/man-modrate.xml rename to opendj-sdk/src/main/docbkx/dev-guide/man-modrate.xml diff --git a/opendj-sdk/opendj3/src/main/docbkx/dev-guide/man-searchrate.xml b/opendj-sdk/src/main/docbkx/dev-guide/man-searchrate.xml similarity index 100% rename from opendj-sdk/opendj3/src/main/docbkx/dev-guide/man-searchrate.xml rename to opendj-sdk/src/main/docbkx/dev-guide/man-searchrate.xml diff --git a/opendj-sdk/opendj3/src/main/docbkx/dev-guide/preface.xml b/opendj-sdk/src/main/docbkx/dev-guide/preface.xml similarity index 100% rename from opendj-sdk/opendj3/src/main/docbkx/dev-guide/preface.xml rename to opendj-sdk/src/main/docbkx/dev-guide/preface.xml diff --git a/opendj-sdk/opendj3/src/main/docbkx/legal.xml b/opendj-sdk/src/main/docbkx/legal.xml similarity index 100% rename from opendj-sdk/opendj3/src/main/docbkx/legal.xml rename to opendj-sdk/src/main/docbkx/legal.xml diff --git a/opendj-sdk/opendj3/src/main/docbkx/shared/glossary.xml b/opendj-sdk/src/main/docbkx/shared/glossary.xml similarity index 100% rename from opendj-sdk/opendj3/src/main/docbkx/shared/glossary.xml rename to opendj-sdk/src/main/docbkx/shared/glossary.xml diff --git a/opendj-sdk/opendj3/src/main/docbkx/shared/itemizedlist-download.xml b/opendj-sdk/src/main/docbkx/shared/itemizedlist-download.xml similarity index 100% rename from opendj-sdk/opendj3/src/main/docbkx/shared/itemizedlist-download.xml rename to opendj-sdk/src/main/docbkx/shared/itemizedlist-download.xml diff --git a/opendj-sdk/opendj3/src/main/docbkx/shared/sec-accessing-doc-online.xml b/opendj-sdk/src/main/docbkx/shared/sec-accessing-doc-online.xml similarity index 100% rename from opendj-sdk/opendj3/src/main/docbkx/shared/sec-accessing-doc-online.xml rename to opendj-sdk/src/main/docbkx/shared/sec-accessing-doc-online.xml diff --git a/opendj-sdk/opendj3/src/main/docbkx/shared/sec-formatting-conventions.xml b/opendj-sdk/src/main/docbkx/shared/sec-formatting-conventions.xml similarity index 100% rename from opendj-sdk/opendj3/src/main/docbkx/shared/sec-formatting-conventions.xml rename to opendj-sdk/src/main/docbkx/shared/sec-formatting-conventions.xml diff --git a/opendj-sdk/opendj3/src/main/docbkx/shared/sec-interface-stability.xml b/opendj-sdk/src/main/docbkx/shared/sec-interface-stability.xml similarity index 100% rename from opendj-sdk/opendj3/src/main/docbkx/shared/sec-interface-stability.xml rename to opendj-sdk/src/main/docbkx/shared/sec-interface-stability.xml diff --git a/opendj-sdk/opendj3/src/main/docbkx/shared/sec-joining-the-community.xml b/opendj-sdk/src/main/docbkx/shared/sec-joining-the-community.xml similarity index 100% rename from opendj-sdk/opendj3/src/main/docbkx/shared/sec-joining-the-community.xml rename to opendj-sdk/src/main/docbkx/shared/sec-joining-the-community.xml diff --git a/opendj-sdk/opendj3/src/main/docbkx/shared/sec-release-levels.xml b/opendj-sdk/src/main/docbkx/shared/sec-release-levels.xml similarity index 100% rename from opendj-sdk/opendj3/src/main/docbkx/shared/sec-release-levels.xml rename to opendj-sdk/src/main/docbkx/shared/sec-release-levels.xml diff --git a/opendj-sdk/opendj3/src/main/docbkx/shared/table-filter-operators.xml b/opendj-sdk/src/main/docbkx/shared/table-filter-operators.xml similarity index 100% rename from opendj-sdk/opendj3/src/main/docbkx/shared/table-filter-operators.xml rename to opendj-sdk/src/main/docbkx/shared/table-filter-operators.xml diff --git a/opendj-sdk/opendj3/src/site/fml/faq.fml b/opendj-sdk/src/site/fml/faq.fml similarity index 100% rename from opendj-sdk/opendj3/src/site/fml/faq.fml rename to opendj-sdk/src/site/fml/faq.fml diff --git a/opendj-sdk/opendj3/src/site/resources/.htaccess b/opendj-sdk/src/site/resources/.htaccess similarity index 100% rename from opendj-sdk/opendj3/src/site/resources/.htaccess rename to opendj-sdk/src/site/resources/.htaccess diff --git a/opendj-sdk/opendj3/src/site/resources/Example.ldif b/opendj-sdk/src/site/resources/Example.ldif similarity index 100% rename from opendj-sdk/opendj3/src/site/resources/Example.ldif rename to opendj-sdk/src/site/resources/Example.ldif diff --git a/opendj-sdk/opendj3/src/site/resources/big-group.ldif b/opendj-sdk/src/site/resources/big-group.ldif similarity index 100% rename from opendj-sdk/opendj3/src/site/resources/big-group.ldif rename to opendj-sdk/src/site/resources/big-group.ldif diff --git a/opendj-sdk/opendj3/src/site/site.xml b/opendj-sdk/src/site/site.xml similarity index 100% rename from opendj-sdk/opendj3/src/site/site.xml rename to opendj-sdk/src/site/site.xml diff --git a/opendj-sdk/opendj3/src/site/xdoc/404.xml b/opendj-sdk/src/site/xdoc/404.xml similarity index 100% rename from opendj-sdk/opendj3/src/site/xdoc/404.xml rename to opendj-sdk/src/site/xdoc/404.xml diff --git a/opendj-sdk/opendj3/src/site/xdoc/docs.xml b/opendj-sdk/src/site/xdoc/docs.xml similarity index 100% rename from opendj-sdk/opendj3/src/site/xdoc/docs.xml rename to opendj-sdk/src/site/xdoc/docs.xml diff --git a/opendj-sdk/opendj3/src/site/xdoc/index.xml b/opendj-sdk/src/site/xdoc/index.xml similarity index 100% rename from opendj-sdk/opendj3/src/site/xdoc/index.xml rename to opendj-sdk/src/site/xdoc/index.xml diff --git a/opendj-sdk/opendj3/src/site/xdoc/news.xml b/opendj-sdk/src/site/xdoc/news.xml similarity index 100% rename from opendj-sdk/opendj3/src/site/xdoc/news.xml rename to opendj-sdk/src/site/xdoc/news.xml -- Gitblit v1.10.0