From c5e342a19b53626ceb4db5f3940ce758eb312d69 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Sat, 23 Apr 2011 17:02:01 +0000
Subject: [PATCH] Partial fix for issue OpenDJ-141: migration OpenDJ3 to Maven 3 - initial commit
---
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/AbstractLDAPFutureResultImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/package-info.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/ldif/LDIFEntryWriterTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/Filter.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/ModifyRequestImpl.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPReader.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreIA5SubstringMatchingRuleImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableGSSAPISASLBindRequestImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/SubentriesRequestControl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreListSubstringMatchingRuleImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/IntermediateResponse.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableCompareResultImpl.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/FilterTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/EntryWriter.java | 0
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/AuthRate.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1Constants.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractUnmodifiableExtendedResultImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/Connections.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractFilterVisitor.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/RoundRobinLoadBalancingAlgorithm.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/IntegerSyntaxImpl.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/GeneralizedTimeSyntaxTest.java | 0
opendj3/opendj-sdk/pom.xml | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/KeyManagers.java | 0
opendj3/opendj-maven-plugin/.classpath | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/TeletexTerminalIdentifierSyntaxImpl.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/CoreSchemaTest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRuleImpl.java | 0
opendj3/opendj-client-tools/src/main/assembly/bin/searchrate | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFChangeRecordReader.java | 0
opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/util/ASCIICharPropTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AuthPasswordExactEqualityMatchingRuleImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/OctetStringSubstringMatchingRuleImpl.java | 0
opendj3/opendj-client-tools/src/main/assembly/bat/ldapsearch.bat | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/ExternalSASLBindRequest.java | 0
opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/LDAPTestCase.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/ldif/LDIFEntryReaderTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/AuthorizationException.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractExtendedResultDecoder.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/FilterVisitor.java | 0
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/package-info.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/LinkedAttribute.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ProxiedAuthV2RequestControl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SupportedAlgorithmSyntaxImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1Writer.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/AnonymousSASLBindRequestTestCase.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/AttributeTypeTest.java | 0
opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/LDAPDefaultTCPNIOTransportTestCase.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1OutputStreamWriterTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableSearchRequestImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/PasswordModifyExtendedResultImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PreReadRequestControl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/LocalizedIllegalArgumentException.java | 0
opendj3/opendj-maven-plugin/src/main/resources/org/opendj/buildtools/maven/Messages.java.stub | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPOptions.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseExactOrderingMatchingRuleTest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ControlDecoder.java | 0
opendj3/opendj-client-tools/src/main/assembly/libbin/_script-util.sh | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableAnonymousSASLBindRequestImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/AttributeDescription.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ReferralException.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseExactIA5EqualityMatchingRuleTest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableGenericExtendedRequestImpl.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/ApproximateMatchingRuleTest.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPConnection.java | 0
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/FileBasedArgument.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NameAndOptionalUIDSyntaxImpl.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPClientFilter.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/LDAPSyntaxDescriptionSyntaxImpl.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/ExtendedRequestTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/LocalizableException.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/SchemaResolver.java | 0
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ConsoleApplication.java | 0
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/CLIException.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/SearchResultHandler.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/TypesTestCase.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Functions.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordPolicyWarningType.java | 0
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/AuthenticatedConnectionFactory.java | 0
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/StringArgument.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFEntryReader.java | 0
opendj3/opendj-client-tools/src/main/assembly/bin/ldapmodify | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableAddRequestImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/GuideSyntaxImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractSASLBindRequest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DITContentRuleSyntaxImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/LinkedHashMapEntry.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/Modification.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/GenericBindRequestTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/ExtendedRequestDecoder.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1ReaderTestCase.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/ModifyRequestTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPListener.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/SortKey.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectClassType.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1ByteSequenceReaderTestCase.java | 0
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/PerformanceRunner.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AbstractOrderingMatchingRuleImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/SSLContextBuilder.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/JPEGSyntaxImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/TimeoutResultException.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ErrorResultIOException.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractIntermediateResponse.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/UnsupportedMessageException.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/MultipleEntriesFoundException.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/UnexpectedResponseException.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UserPasswordSyntaxImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/ExtendedRequest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/GeneralizedTimeEqualityMatchingRuleImpl.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/UUIDSyntaxTest.java | 0
opendj3/opendj-client-tools/src/main/assembly/bat/modrate.bat | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractUnmodifiableSASLBindRequest.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/ByteStringBuilderTestCase.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1WriterTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ConnectionEntryWriter.java | 0
opendj3/opendj-client-tools/.settings/org.maven.ide.eclipse.prefs | 0
opendj3/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_fr.properties | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/package-info.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DITStructureRuleSyntaxImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/CRAMMD5SASLBindRequestImpl.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/RDNTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/HeartBeatConnectionFactory.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableModifyDNRequestImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableGenericIntermediateResponseImpl.java | 0
opendj3/opendj-maven-plugin/pom.xml | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/AbstractLDIFWriter.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DITContentRule.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/BindRequest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/CRAMMD5SASLBindRequest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreIA5EqualityMatchingRuleImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringSyntaxImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ChangeRecordWriter.java | 0
opendj3/opendj-client-tools/.settings/org.eclipse.jdt.core.prefs | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/UTCTimeSyntaxTest.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1InputStreamReaderTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/OctetStringEqualityMatchingRuleImpl.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/BindRequestTestCase.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/UnbindRequestTestCase.java | 0
opendj3/opendj-client-tools/src/test/java/com/sun/opends/sdk/tools/ToolsTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/InternalConnectionFactory.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UniqueMemberEqualityMatchingRuleImpl.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/IA5StringSyntaxTest.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Validator.java | 0
opendj3/opendj-client-tools/src/main/assembly/bat/ldappasswordmodify.bat | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/VirtualListViewResponseControl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/PasswordModifyExtendedRequest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractEntry.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractRequestImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/SearchRequestImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableExternalSASLBindRequestImpl.java | 0
opendj3/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_es.properties | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/AbstractLDIFStream.java | 0
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ToolConstants.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/LoadBalancingAlgorithm.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/EnhancedGuideSyntaxImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/EntryNotFoundException.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ProxiedAuthV1RequestControl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CertificateListSyntaxImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordPolicyResponseControl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1OutputStreamWriter.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateOperation.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/ConnectionFactoryTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractUnmodifiableIntermediateResponseImpl.java | 0
opendj3/opendj-testng-support/src/main/java/org/opendj/buildtools/testng/OpenDJTestListener.java | 0
opendj3/opendj-testng-support/.settings/org.maven.ide.eclipse.prefs | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/ModifyDNRequestImpl.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPMessageHandler.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/AVA.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/ByteSequenceOutputStream.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1ByteSequenceReader.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/ExtendedResult.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DistinguishedNameSyntaxImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/FaxSyntaxImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/RegexSyntaxImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableModifyRequestImpl.java | 0
opendj3/opendj-testng-support/src/main/java/org/opendj/buildtools/testng/OpenDJTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiablePasswordModifyExtendedRequestImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/WordEqualityMatchingRuleImpl.java | 0
opendj3/opendj-maven-plugin/src/main/resources/org/opendj/buildtools/maven/check-src.xml | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/SASLEncoderTransformer.java | 0
opendj3/opendj-client-tools/src/main/assembly/bin/ldapcompare | 0
opendj3/opendj-client-tools/src/test/java/com/sun/opends/sdk/tools/PerfToolTCPNIOTransportFactoryTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/SASLBindRequest.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/package-info.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableSearchResultEntryImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AbstractSubstringMatchingRuleImpl.java | 0
opendj3/opendj-client-tools/src/main/assembly/bat/ldapcompare.bat | 0
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ArgumentParser.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AbstractMatchingRuleImpl.java | 0
opendj3/opendj-client-tools/src/main/assembly/bat/authrate.bat | 0
opendj3/opendj-sdk/src/main/javadoc/overview.html | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/PlainSASLBindRequest.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseExactSubstringMatchingRuleTest.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Iterators.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ConstraintViolationException.java | 0
opendj3/opendj-maven-plugin/src/main/java/org/opendj/buildtools/maven/MessagePropertyKey.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/package-info.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractAsynchronousConnection.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/responses/ResponsesTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UUIDOrderingMatchingRuleImpl.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/BitStringEqualityMatchingRuleTest.java | 0
opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/util/StringPrepProfileTestCase.java | 0
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/BooleanArgument.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ProtocolInformationEqualityMatchingRuleImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaBuilder.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPUrl.java | 0
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ApplicationKeyManager.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/AttributeFactory.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/WhoAmIExtendedResult.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/AbstractSchemaElementTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AttributeTypeSyntaxImpl.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/OrderingMatchingRuleTest.java | 0
opendj3/opendj-sdk/.classpath | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableGenericExtendedResultImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableSimpleBindRequestImpl.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateOperationType.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/package-info.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DITStructureRule.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableAbandonRequestImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/IntegerEqualityMatchingRuleImpl.java | 0
opendj3/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_zh_TW.properties | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractUnmodifiableResultImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AddRequest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/BooleanEqualityMatchingRuleImpl.java | 0
opendj3/opendj-client-tools/README | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPServerFilter.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PostReadResponseControl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectClass.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PreReadResponseControl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/SubtreeDeleteRequestControl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/WhoAmIExtendedRequestImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/SearchResultReferenceIOException.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PostReadRequestControl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ConnectionChangeRecordWriter.java | 0
opendj3/opendj-client-tools/src/main/assembly/bin/ldappasswordmodify | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableBindResultImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/FailoverLoadBalancingAlgorithm.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/DN.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFEntryWriter.java | 0
opendj3/opendj-testng-support/src/main/java/org/opendj/buildtools/testng/package-info.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/MatchingRuleSyntaxTest.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/MatchingRuleTest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ServerConnectionFactory.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/AttributeDescriptionTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/RDN.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SubstringAssertionSyntaxImpl.java | 0
opendj3/opendj-client-tools/src/main/assembly/bat/ldapmodify.bat | 0
opendj3/opendj-testng-support/.settings/org.eclipse.jdt.core.prefs | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/LinkedAttributeTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractUnmodifiableExtendedRequest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/CancelledResultException.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbandonRequest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DistinguishedNameEqualityMatchingRuleImpl.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/SASLFilter.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/AssertionFailureException.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Iterables.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/EntryChangeNotificationResponseControl.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/ldif/LDIFTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/TelephoneNumberEqualityMatchingRuleImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/LoadBalancer.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/SimplePagedResultsControl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AbstractSyntaxImpl.java | 0
opendj3/opendj-client-tools/src/main/assembly/bin/modrate | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectIdentifierEqualityMatchingRuleImpl.java | 0
opendj3/opendj-testng-support/pom.xml | 2
opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/util/UtilTestCase.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/StringPrepProfile.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableDigestMD5SASLBindRequestImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DirectoryStringSyntaxImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/StartTLSExtendedRequest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AnonymousSASLBindRequestImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableCompareRequestImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/PlainSASLBindRequestImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/BitStringEqualityMatchingRuleImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnbindRequest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/SearchResultReference.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/LDAPListenerTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/DigestMD5SASLBindRequestImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/PresentationAddressEqualityMatchingRuleImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AttributeType.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaCompatOptions.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UUIDSyntaxImpl.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/DNTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/GenericExtendedRequest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaUtils.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/ByteStringTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/AuthorizationIdentityRequestControl.java | 0
opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/controls/AccountUsabilityRequestControlTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractUnmodifiableResponseImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CoreSchemaImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/PasswordModifyExtendedRequestImpl.java | 0
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/Utils.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/GenericBindRequest.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/GetConnectionIDExtendedRequest.java | 0
opendj3/opendj-client-tools/.project | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/GenericIntermediateResponseImpl.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/AttributeTypeSyntaxTest.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/LDAPServer.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/GenericIntermediateResponse.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiablePasswordModifyExtendedResultImpl.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/LocalizableMessageDescriptor.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/SimpleBindRequestTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NameFormSyntaxImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/Response.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreOrderingMatchingRuleImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/SimpleBindRequestImpl.java | 0
opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/controls/AccountUsabilityResponseControlTestCase.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Collections2.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableStartTLSExtendedRequestImpl.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseIgnoreEqualityMatchingRuleTest.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/RecursiveFutureResult.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/EntriesTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiablePlainSASLBindRequestImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/DecodeException.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/BindClientImpl.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/GetSymmetricKeyExtendedRequest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/SimpleBindRequest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/SearchResultReferenceImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/BindResult.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/OctetStringOrderingMatchingRuleImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UTCTimeSyntaxImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/DereferenceAliasesPolicy.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/Responses.java | 0
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ArgumentGroup.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/OtherMailboxSyntaxTest.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/GSSAPISASLBindRequestTestCase.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/RegexSyntaxTestCase.java | 0
opendj3/opendj-testng-support/.project | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/CompareResultImpl.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPExtendedFutureResultImpl.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPUtils.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableWhoAmIExtendedResultImpl.java | 0
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/DataSource.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/CRAMMD5SASLBindRequestTestCase.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/ModifyDNRequestTestCase.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/VirtualAttributesOnlyRequestControl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/PostalAddressSyntaxImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PermissiveModifyRequestControl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/IA5StringSyntaxImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/TelephoneNumberSyntaxImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ResultCode.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/EqualLengthApproximateMatchingRuleImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/SearchRequest.java | 0
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/PerfToolTCPNIOTransportFactory.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/StartTLSExtendedRequestImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/WhoAmIExtendedResultImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AuthPasswordSyntaxImpl.java | 0
opendj3/opendj-maven-plugin/src/main/resources/org/opendj/buildtools/maven/opendj.sourceheader | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/AbstractLDAPMessageHandler.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/ASCIICharProp.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseIgnoreSubstringMatchingRuleTest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordExpiredResponseControl.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/BooleanEqualityMatchingRuleTest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/Entry.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbandonRequestImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CoreSchema.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/Syntax.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/BindClient.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/GetConnectionIDExtendedResult.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ServerConnection.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableUnbindRequestImpl.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/SizeLimitInputStream.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ConnectionFactory.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/package-info.java | 0
opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/util/StaticUtilsTestCase.java | 0
opendj3/opendj-maven-plugin/.project | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/package-info.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/GenerateCoreSchema.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ChangeRecordReader.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/package-info.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/DeleteRequestTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/WhoAmIExtendedRequest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/LocalizableMessageBuilder.java | 0
opendj3/opendj-maven-plugin/src/main/java/org/opendj/buildtools/maven/GenerateMessagesMojo.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/RequestHandler.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DeliveryMethodSyntaxImpl.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/AccountUsabilityResponseControl.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseIgnoreIA5EqualityMatchingRuleTest.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseExactEqualityMatchingRuleTest.java | 0
opendj3/opendj-sdk/.settings/org.maven.ide.eclipse.prefs | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/AsynchronousConnection.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/TimeoutChecker.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/AccountUsabilityRequestControl.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/StaticUtils.java | 0
opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/util/Base64TestCase.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/DigestMD5SASLBindRequestTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UnknownSchemaElementException.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ConnectionEntryReader.java | 0
opendj3/opendj-maven-plugin/src/main/java/org/opendj/buildtools/maven/package-info.java | 0
opendj3/opendj-client-tools/src/main/assembly/libbat/setcp.bat | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/GeneralizedTimeSyntaxImpl.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPWriter.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableCancelExtendedRequestImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaException.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractLoadBalancingAlgorithm.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFChangeRecordWriter.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableDeleteRequestImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/ExtendedResultDecoder.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/ResultImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactIA5SubstringMatchingRuleImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/EntryReader.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Predicate.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ConnectionException.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/DigestMD5SASLBindRequest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/AbstractASN1Writer.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/Entries.java | 0
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ArgumentException.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/GenericExtendedRequestImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/TreeMapEntry.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/SynchronousConnectionTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/AuthenticationException.java | 0
opendj3/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_de.properties | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/DeleteRequestImpl.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/SchemaUtilsTest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/GenericExtendedResultImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/BooleanSyntaxImpl.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/MatchingRuleUseSyntaxTest.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/AsynchronousFutureResult.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateOperationContainer.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/DITContentRuleSyntaxTest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractConnection.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ManageDsaITRequestControl.java | 0
opendj3/opendj-client-tools/src/main/assembly/libbat/_script-util.bat | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreListEqualityMatchingRuleImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/BitStringSyntaxImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/ExternalSASLBindRequestImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ConnectionEventListener.java | 0
opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/ASN1BufferWriterTestCase.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/ASN1BufferReader.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPBindFutureResultImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/TelexNumberSyntaxImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/LocalizableMessage.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/EnumSyntaxImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ChangeRecordVisitorWriter.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Base64.java | 0
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPPasswordModify.java | 0
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/MultiChoiceArgument.java | 0
opendj3/opendj-client-tools/pom.xml | 6 -
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/GenericBindRequestImpl.java | 0
opendj3/opendj-client-tools/src/main/assembly/libbin/_client-script.sh | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/InternalConnection.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/LDAPUrlTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ChangeRecord.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPConstants.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableWhoAmIExtendedRequestImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/PresentationAddressSyntaxImpl.java | 0
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ModRate.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordPolicyErrorType.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/SearchScope.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractAttribute.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/BitStringSyntaxTest.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/SyntaxTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/Request.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UserPasswordExactEqualityMatchingRuleImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableCRAMMD5SASLBindRequestImpl.java | 0
opendj3/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_ko.properties | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/OctetStringSyntaxImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/RootDSE.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/PlainSASLBindRequestTestCase.java | 0
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/Argument.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaConstants.java | 0
opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/ASN1BufferReaderTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/GSSAPISASLBindRequestImpl.java | 0
opendj3/opendj-sdk/.project | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/TelexSyntaxTest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/Requests.java | 0
opendj3/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_ja.properties | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableGenericBindRequestImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractMapEntry.java | 0
opendj3/opendj-client-tools/src/main/assembly/bin/authrate | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/Connection.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NameForm.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/SdkTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/GenericExtendedResult.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ConflictingSchemaElementException.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ConnectionPool.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/FutureResultTransformer.java | 0
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/IntegerArgument.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreEqualityMatchingRuleImpl.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseIgnoreOrderingMatchingRuleTest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ErrorResultException.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPListenerOptions.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/AddRequestTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ConditionResult.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/GSSAPISASLBindRequest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableSearchResultReferenceImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CertificatePairSyntaxImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SyntaxImpl.java | 0
opendj3/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages.properties | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ServerSideSortRequestControl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CertificateSyntaxImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1.java | 0
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/SearchRate.java | 0
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/PromptingTrustManager.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableResultImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/IntegerOrderingMatchingRuleImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/AssertionRequestControl.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/SubstringReader.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/RequestTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractResultImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/CancelExtendedRequestImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/Result.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CountryStringSyntaxImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/KeywordEqualityMatchingRuleImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1InputStreamReader.java | 0
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPCompare.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/FutureResult.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/GuideSyntaxTest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactOrderingMatchingRuleImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRuleUse.java | 0
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPModify.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/SynchronousConnection.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/AuthenticatedConnectionFactory.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/BinarySyntaxImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPConnectionFactory.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPConnectionFactoryImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/DecodeOptions.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/MatchedValuesRequestControl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/Assertion.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ByteStringBuilder.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/SchemaTestCase.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateExtendedRequest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PersistentSearchRequestControl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/Matcher.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/package-info.java | 0
opendj3/opendj-client-tools/src/main/assembly/bat/searchrate.bat | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/CompareRequestTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/PasswordModifyExtendedResult.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/AsynchronousConnectionDecorator.java | 0
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/MultiColumnPrinter.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/SearchResultEntry.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/GeneralizedTimeOrderingMatchingRuleImpl.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/RequestsTestCase.java | 0
opendj3/opendj-client-tools/src/main/assembly/libbat/_client-script.bat | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/SearchResultEntryImpl.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/ByteSequenceTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringEqualityMatchingRuleImpl.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/SubstitutionSyntaxTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ModificationType.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/CancelExtendedRequest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/package-info.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/DeleteRequest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/AuthorizationIdentityResponseControl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractUnmodifiableBindRequest.java | 0
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ConnectionFactoryProvider.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnbindRequestImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/GetEffectiveRightsRequestControl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectClassSyntaxImpl.java | 0
opendj3/opendj-maven-plugin/.settings/org.maven.ide.eclipse.prefs | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ByteString.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/ExternalSASLBindRequestTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactSubstringMatchingRuleImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/IntermediateResponseHandler.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractConnectionFactory.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/AbandonRequestTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/PrintableStringSyntaxImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordExpiringResponseControl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/Attributes.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPSearchFutureResultImpl.java | 0
opendj3/opendj-maven-plugin/src/main/resources/org/opendj/buildtools/maven/check-unit-tests.xml | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPClientContext.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/AbstractASN1Reader.java | 0
opendj3/pom.xml | 49 ++++++++----
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPCompareFutureResultImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/VirtualListViewRequestControl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/ModifyDNRequest.java | 0
opendj3/opendj-maven-plugin/.settings/org.eclipse.jdt.core.prefs | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/Attribute.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/TrustManagers.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ConnectionSecurityLayer.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/CompareResult.java | 0
opendj3/opendj-maven-plugin/src/main/java/org/opendj/buildtools/maven/MessageFile.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/package-info.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/LDAPSyntaxTest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/CompareRequest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UUIDEqualityMatchingRuleImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AttributeUsage.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractResponseImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ByteSequenceReader.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ServerSideSortResponseControl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ResultHandler.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AddRequestImpl.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/UnexpectedRequestException.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreSubstringMatchingRuleImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRuleSyntaxImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordPolicyRequestControl.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Function.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateExtendedResult.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AnonymousSASLBindRequest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/ModifyRequest.java | 0
opendj3/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_zh_CN.properties | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1Reader.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPFutureResultImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringOrderingMatchingRuleImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ChangeRecordVisitor.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaElement.java | 0
opendj3/opendj-client-tools/src/main/assembly/bin/ldapsearch | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringSubstringMatchingRuleImpl.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/EnumSyntaxTestCase.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactEqualityMatchingRuleImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/Schema.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactIA5EqualityMatchingRuleImpl.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/ASN1BufferWriter.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/SASLDecoderTransformer.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/OIDSyntaxImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/SASLBindClientImpl.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseExactIA5SubstringMatchingRuleTest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PersistentSearchChangeType.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ByteSequence.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/OtherMailboxSyntaxImpl.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/RealAttributesOnlyRequestControl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractBindRequest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/BindResultImpl.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/controls/ControlsTestCase.java | 0
opendj3/opendj-testng-support/.classpath | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRule.java | 0
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPSearch.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPListenerImpl.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/EntryTestCase.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/SubstringMatchingRuleTest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ProtocolInformationSyntaxImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/AbstractLDIFReader.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractExtendedRequest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/Control.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractUnmodifiableRequest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/EntryFactory.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/TestCaseUtils.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/TelephoneNumberSubstringMatchingRuleImpl.java | 0
opendj3/opendj-sdk/.settings/org.eclipse.jdt.core.prefs | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/CompletedFutureResult.java | 0
opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPDefaultTCPNIOTransport.java | 0
opendj3/opendj-client-tools/src/main/assembly/descriptor.xml | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/GenericControl.java | 0
/dev/null | 144 ------------------------------------
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/CompareRequestImpl.java | 0
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/DistinguishedNameEqualityMatchingRuleTest.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractExtendedResult.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRuleUseSyntaxImpl.java | 0
opendj3/opendj-client-tools/.classpath | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/FacsimileNumberSyntaxImpl.java | 0
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/EnumOrderingMatchingRule.java | 0
646 files changed, 36 insertions(+), 169 deletions(-)
diff --git a/opendj3/opendj-build-tools/.project b/opendj3/opendj-build-tools/.project
deleted file mode 100644
index 81a808c..0000000
--- a/opendj3/opendj-build-tools/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>opendj-build-tools</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </natures>
-</projectDescription>
diff --git a/opendj3/opendj-build-tools/.settings/org.maven.ide.eclipse.prefs b/opendj3/opendj-build-tools/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 6e90395..0000000
--- a/opendj3/opendj-build-tools/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Fri Feb 11 18:59:22 CET 2011
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/opendj3/opendj-build-tools/pom.xml b/opendj3/opendj-build-tools/pom.xml
deleted file mode 100644
index 9474ef0..0000000
--- a/opendj3/opendj-build-tools/pom.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ! CDDL HEADER START
- !
- ! The contents of this file are subject to the terms of the
- ! Common Development and Distribution License, Version 1.0 only
- ! (the "License"). You may not use this file except in compliance
- ! with the License.
- !
- ! You can obtain a copy of the license at
- ! trunk/opends/resource/legal-notices/CDDLv1_0.txt
- ! or http://forgerock.org/license/CDDLv1.0.html.
- ! See the License for the specific language governing permissions
- ! and limitations under the License.
- !
- ! When distributing Covered Code, include this CDDL HEADER in each
- ! file and include the License file at
- ! trunk/opends/resource/legal-notices/CDDLv1_0.txt. If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
- ! Portions Copyright [yyyy] [name of copyright owner]
- !
- ! CDDL HEADER END
- !
- ! Copyright 2011 ForgeRock AS
- !
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>opendj-project</artifactId>
- <groupId>org.opendj</groupId>
- <version>3.0-SNAPSHOT</version>
- </parent>
- <artifactId>opendj-build-tools</artifactId>
- <packaging>pom</packaging>
- <name>OpenDJ Build Tools</name>
- <modules>
- <module>opendj-maven-plugin</module>
- <module>opendj-testng-support</module>
- </modules>
-</project>
diff --git a/opendj3/opendj-modules/opendj-client-tools/.classpath b/opendj3/opendj-client-tools/.classpath
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/.classpath
rename to opendj3/opendj-client-tools/.classpath
diff --git a/opendj3/opendj-modules/opendj-client-tools/.project b/opendj3/opendj-client-tools/.project
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/.project
rename to opendj3/opendj-client-tools/.project
diff --git a/opendj3/opendj-modules/opendj-client-tools/.settings/org.eclipse.jdt.core.prefs b/opendj3/opendj-client-tools/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/.settings/org.eclipse.jdt.core.prefs
rename to opendj3/opendj-client-tools/.settings/org.eclipse.jdt.core.prefs
diff --git a/opendj3/opendj-modules/opendj-client-tools/.settings/org.maven.ide.eclipse.prefs b/opendj3/opendj-client-tools/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/.settings/org.maven.ide.eclipse.prefs
rename to opendj3/opendj-client-tools/.settings/org.maven.ide.eclipse.prefs
diff --git a/opendj3/opendj-modules/opendj-client-tools/README b/opendj3/opendj-client-tools/README
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/README
rename to opendj3/opendj-client-tools/README
diff --git a/opendj3/opendj-modules/opendj-client-tools/pom.xml b/opendj3/opendj-client-tools/pom.xml
similarity index 94%
rename from opendj3/opendj-modules/opendj-client-tools/pom.xml
rename to opendj3/opendj-client-tools/pom.xml
index 9df8951..f57d6b1 100644
--- a/opendj3/opendj-modules/opendj-client-tools/pom.xml
+++ b/opendj3/opendj-client-tools/pom.xml
@@ -29,7 +29,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>opendj-modules</artifactId>
+ <artifactId>opendj-project</artifactId>
<groupId>org.opendj</groupId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -71,10 +71,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2</version>
<executions>
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/assembly/bat/authrate.bat b/opendj3/opendj-client-tools/src/main/assembly/bat/authrate.bat
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/assembly/bat/authrate.bat
rename to opendj3/opendj-client-tools/src/main/assembly/bat/authrate.bat
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/assembly/bat/ldapcompare.bat b/opendj3/opendj-client-tools/src/main/assembly/bat/ldapcompare.bat
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/assembly/bat/ldapcompare.bat
rename to opendj3/opendj-client-tools/src/main/assembly/bat/ldapcompare.bat
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/assembly/bat/ldapmodify.bat b/opendj3/opendj-client-tools/src/main/assembly/bat/ldapmodify.bat
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/assembly/bat/ldapmodify.bat
rename to opendj3/opendj-client-tools/src/main/assembly/bat/ldapmodify.bat
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/assembly/bat/ldappasswordmodify.bat b/opendj3/opendj-client-tools/src/main/assembly/bat/ldappasswordmodify.bat
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/assembly/bat/ldappasswordmodify.bat
rename to opendj3/opendj-client-tools/src/main/assembly/bat/ldappasswordmodify.bat
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/assembly/bat/ldapsearch.bat b/opendj3/opendj-client-tools/src/main/assembly/bat/ldapsearch.bat
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/assembly/bat/ldapsearch.bat
rename to opendj3/opendj-client-tools/src/main/assembly/bat/ldapsearch.bat
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/assembly/bat/modrate.bat b/opendj3/opendj-client-tools/src/main/assembly/bat/modrate.bat
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/assembly/bat/modrate.bat
rename to opendj3/opendj-client-tools/src/main/assembly/bat/modrate.bat
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/assembly/bat/searchrate.bat b/opendj3/opendj-client-tools/src/main/assembly/bat/searchrate.bat
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/assembly/bat/searchrate.bat
rename to opendj3/opendj-client-tools/src/main/assembly/bat/searchrate.bat
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/assembly/bin/authrate b/opendj3/opendj-client-tools/src/main/assembly/bin/authrate
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/assembly/bin/authrate
rename to opendj3/opendj-client-tools/src/main/assembly/bin/authrate
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/assembly/bin/ldapcompare b/opendj3/opendj-client-tools/src/main/assembly/bin/ldapcompare
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/assembly/bin/ldapcompare
rename to opendj3/opendj-client-tools/src/main/assembly/bin/ldapcompare
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/assembly/bin/ldapmodify b/opendj3/opendj-client-tools/src/main/assembly/bin/ldapmodify
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/assembly/bin/ldapmodify
rename to opendj3/opendj-client-tools/src/main/assembly/bin/ldapmodify
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/assembly/bin/ldappasswordmodify b/opendj3/opendj-client-tools/src/main/assembly/bin/ldappasswordmodify
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/assembly/bin/ldappasswordmodify
rename to opendj3/opendj-client-tools/src/main/assembly/bin/ldappasswordmodify
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/assembly/bin/ldapsearch b/opendj3/opendj-client-tools/src/main/assembly/bin/ldapsearch
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/assembly/bin/ldapsearch
rename to opendj3/opendj-client-tools/src/main/assembly/bin/ldapsearch
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/assembly/bin/modrate b/opendj3/opendj-client-tools/src/main/assembly/bin/modrate
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/assembly/bin/modrate
rename to opendj3/opendj-client-tools/src/main/assembly/bin/modrate
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/assembly/bin/searchrate b/opendj3/opendj-client-tools/src/main/assembly/bin/searchrate
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/assembly/bin/searchrate
rename to opendj3/opendj-client-tools/src/main/assembly/bin/searchrate
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/assembly/descriptor.xml b/opendj3/opendj-client-tools/src/main/assembly/descriptor.xml
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/assembly/descriptor.xml
rename to opendj3/opendj-client-tools/src/main/assembly/descriptor.xml
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/assembly/libbat/_client-script.bat b/opendj3/opendj-client-tools/src/main/assembly/libbat/_client-script.bat
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/assembly/libbat/_client-script.bat
rename to opendj3/opendj-client-tools/src/main/assembly/libbat/_client-script.bat
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/assembly/libbat/_script-util.bat b/opendj3/opendj-client-tools/src/main/assembly/libbat/_script-util.bat
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/assembly/libbat/_script-util.bat
rename to opendj3/opendj-client-tools/src/main/assembly/libbat/_script-util.bat
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/assembly/libbat/setcp.bat b/opendj3/opendj-client-tools/src/main/assembly/libbat/setcp.bat
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/assembly/libbat/setcp.bat
rename to opendj3/opendj-client-tools/src/main/assembly/libbat/setcp.bat
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/assembly/libbin/_client-script.sh b/opendj3/opendj-client-tools/src/main/assembly/libbin/_client-script.sh
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/assembly/libbin/_client-script.sh
rename to opendj3/opendj-client-tools/src/main/assembly/libbin/_client-script.sh
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/assembly/libbin/_script-util.sh b/opendj3/opendj-client-tools/src/main/assembly/libbin/_script-util.sh
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/assembly/libbin/_script-util.sh
rename to opendj3/opendj-client-tools/src/main/assembly/libbin/_script-util.sh
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ApplicationKeyManager.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ApplicationKeyManager.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ApplicationKeyManager.java
rename to opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ApplicationKeyManager.java
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/Argument.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/Argument.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/Argument.java
rename to opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/Argument.java
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ArgumentException.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ArgumentException.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ArgumentException.java
rename to opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ArgumentException.java
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ArgumentGroup.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ArgumentGroup.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ArgumentGroup.java
rename to opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ArgumentGroup.java
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ArgumentParser.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ArgumentParser.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ArgumentParser.java
rename to opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ArgumentParser.java
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/AuthRate.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/AuthRate.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/AuthRate.java
rename to opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/AuthRate.java
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/AuthenticatedConnectionFactory.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/AuthenticatedConnectionFactory.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/AuthenticatedConnectionFactory.java
rename to opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/AuthenticatedConnectionFactory.java
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/BooleanArgument.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/BooleanArgument.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/BooleanArgument.java
rename to opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/BooleanArgument.java
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/CLIException.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/CLIException.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/CLIException.java
rename to opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/CLIException.java
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ConnectionFactoryProvider.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ConnectionFactoryProvider.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ConnectionFactoryProvider.java
rename to opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ConnectionFactoryProvider.java
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ConsoleApplication.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ConsoleApplication.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ConsoleApplication.java
rename to opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ConsoleApplication.java
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/DataSource.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/DataSource.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/DataSource.java
rename to opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/DataSource.java
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/FileBasedArgument.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/FileBasedArgument.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/FileBasedArgument.java
rename to opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/FileBasedArgument.java
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/IntegerArgument.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/IntegerArgument.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/IntegerArgument.java
rename to opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/IntegerArgument.java
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPCompare.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPCompare.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPCompare.java
rename to opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPCompare.java
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPModify.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPModify.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPModify.java
rename to opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPModify.java
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPPasswordModify.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPPasswordModify.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPPasswordModify.java
rename to opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPPasswordModify.java
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPSearch.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPSearch.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPSearch.java
rename to opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPSearch.java
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ModRate.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ModRate.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ModRate.java
rename to opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ModRate.java
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/MultiChoiceArgument.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/MultiChoiceArgument.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/MultiChoiceArgument.java
rename to opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/MultiChoiceArgument.java
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/MultiColumnPrinter.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/MultiColumnPrinter.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/MultiColumnPrinter.java
rename to opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/MultiColumnPrinter.java
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/PerfToolTCPNIOTransportFactory.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/PerfToolTCPNIOTransportFactory.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/PerfToolTCPNIOTransportFactory.java
rename to opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/PerfToolTCPNIOTransportFactory.java
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/PerformanceRunner.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/PerformanceRunner.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/PerformanceRunner.java
rename to opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/PerformanceRunner.java
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/PromptingTrustManager.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/PromptingTrustManager.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/PromptingTrustManager.java
rename to opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/PromptingTrustManager.java
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/SearchRate.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/SearchRate.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/SearchRate.java
rename to opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/SearchRate.java
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/StringArgument.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/StringArgument.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/StringArgument.java
rename to opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/StringArgument.java
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ToolConstants.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ToolConstants.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ToolConstants.java
rename to opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ToolConstants.java
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/Utils.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/Utils.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/Utils.java
rename to opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/Utils.java
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/package-info.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/package-info.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/package-info.java
rename to opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/package-info.java
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/test/java/com/sun/opends/sdk/tools/PerfToolTCPNIOTransportFactoryTestCase.java b/opendj3/opendj-client-tools/src/test/java/com/sun/opends/sdk/tools/PerfToolTCPNIOTransportFactoryTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/test/java/com/sun/opends/sdk/tools/PerfToolTCPNIOTransportFactoryTestCase.java
rename to opendj3/opendj-client-tools/src/test/java/com/sun/opends/sdk/tools/PerfToolTCPNIOTransportFactoryTestCase.java
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/test/java/com/sun/opends/sdk/tools/ToolsTestCase.java b/opendj3/opendj-client-tools/src/test/java/com/sun/opends/sdk/tools/ToolsTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-client-tools/src/test/java/com/sun/opends/sdk/tools/ToolsTestCase.java
rename to opendj3/opendj-client-tools/src/test/java/com/sun/opends/sdk/tools/ToolsTestCase.java
diff --git a/opendj3/opendj-build-tools/opendj-maven-plugin/.classpath b/opendj3/opendj-maven-plugin/.classpath
similarity index 100%
rename from opendj3/opendj-build-tools/opendj-maven-plugin/.classpath
rename to opendj3/opendj-maven-plugin/.classpath
diff --git a/opendj3/opendj-build-tools/opendj-maven-plugin/.project b/opendj3/opendj-maven-plugin/.project
similarity index 100%
rename from opendj3/opendj-build-tools/opendj-maven-plugin/.project
rename to opendj3/opendj-maven-plugin/.project
diff --git a/opendj3/opendj-build-tools/opendj-maven-plugin/.settings/org.eclipse.jdt.core.prefs b/opendj3/opendj-maven-plugin/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from opendj3/opendj-build-tools/opendj-maven-plugin/.settings/org.eclipse.jdt.core.prefs
rename to opendj3/opendj-maven-plugin/.settings/org.eclipse.jdt.core.prefs
diff --git a/opendj3/opendj-build-tools/opendj-maven-plugin/.settings/org.maven.ide.eclipse.prefs b/opendj3/opendj-maven-plugin/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from opendj3/opendj-build-tools/opendj-maven-plugin/.settings/org.maven.ide.eclipse.prefs
rename to opendj3/opendj-maven-plugin/.settings/org.maven.ide.eclipse.prefs
diff --git a/opendj3/opendj-build-tools/opendj-maven-plugin/pom.xml b/opendj3/opendj-maven-plugin/pom.xml
similarity index 97%
rename from opendj3/opendj-build-tools/opendj-maven-plugin/pom.xml
rename to opendj3/opendj-maven-plugin/pom.xml
index a3d50d3..4f92575 100644
--- a/opendj3/opendj-build-tools/opendj-maven-plugin/pom.xml
+++ b/opendj3/opendj-maven-plugin/pom.xml
@@ -30,7 +30,7 @@
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>opendj-build-tools</artifactId>
+ <artifactId>opendj-project</artifactId>
<groupId>org.opendj</groupId>
<version>3.0-SNAPSHOT</version>
</parent>
diff --git a/opendj3/opendj-build-tools/opendj-maven-plugin/src/main/java/org/opendj/buildtools/maven/GenerateMessagesMojo.java b/opendj3/opendj-maven-plugin/src/main/java/org/opendj/buildtools/maven/GenerateMessagesMojo.java
similarity index 100%
rename from opendj3/opendj-build-tools/opendj-maven-plugin/src/main/java/org/opendj/buildtools/maven/GenerateMessagesMojo.java
rename to opendj3/opendj-maven-plugin/src/main/java/org/opendj/buildtools/maven/GenerateMessagesMojo.java
diff --git a/opendj3/opendj-build-tools/opendj-maven-plugin/src/main/java/org/opendj/buildtools/maven/MessageFile.java b/opendj3/opendj-maven-plugin/src/main/java/org/opendj/buildtools/maven/MessageFile.java
similarity index 100%
rename from opendj3/opendj-build-tools/opendj-maven-plugin/src/main/java/org/opendj/buildtools/maven/MessageFile.java
rename to opendj3/opendj-maven-plugin/src/main/java/org/opendj/buildtools/maven/MessageFile.java
diff --git a/opendj3/opendj-build-tools/opendj-maven-plugin/src/main/java/org/opendj/buildtools/maven/MessagePropertyKey.java b/opendj3/opendj-maven-plugin/src/main/java/org/opendj/buildtools/maven/MessagePropertyKey.java
similarity index 100%
rename from opendj3/opendj-build-tools/opendj-maven-plugin/src/main/java/org/opendj/buildtools/maven/MessagePropertyKey.java
rename to opendj3/opendj-maven-plugin/src/main/java/org/opendj/buildtools/maven/MessagePropertyKey.java
diff --git a/opendj3/opendj-build-tools/opendj-maven-plugin/src/main/java/org/opendj/buildtools/maven/package-info.java b/opendj3/opendj-maven-plugin/src/main/java/org/opendj/buildtools/maven/package-info.java
similarity index 100%
rename from opendj3/opendj-build-tools/opendj-maven-plugin/src/main/java/org/opendj/buildtools/maven/package-info.java
rename to opendj3/opendj-maven-plugin/src/main/java/org/opendj/buildtools/maven/package-info.java
diff --git a/opendj3/opendj-build-tools/opendj-maven-plugin/src/main/resources/org/opendj/buildtools/maven/Messages.java.stub b/opendj3/opendj-maven-plugin/src/main/resources/org/opendj/buildtools/maven/Messages.java.stub
similarity index 100%
rename from opendj3/opendj-build-tools/opendj-maven-plugin/src/main/resources/org/opendj/buildtools/maven/Messages.java.stub
rename to opendj3/opendj-maven-plugin/src/main/resources/org/opendj/buildtools/maven/Messages.java.stub
diff --git a/opendj3/opendj-build-tools/opendj-maven-plugin/src/main/resources/org/opendj/buildtools/maven/check-src.xml b/opendj3/opendj-maven-plugin/src/main/resources/org/opendj/buildtools/maven/check-src.xml
similarity index 100%
rename from opendj3/opendj-build-tools/opendj-maven-plugin/src/main/resources/org/opendj/buildtools/maven/check-src.xml
rename to opendj3/opendj-maven-plugin/src/main/resources/org/opendj/buildtools/maven/check-src.xml
diff --git a/opendj3/opendj-build-tools/opendj-maven-plugin/src/main/resources/org/opendj/buildtools/maven/check-unit-tests.xml b/opendj3/opendj-maven-plugin/src/main/resources/org/opendj/buildtools/maven/check-unit-tests.xml
similarity index 100%
rename from opendj3/opendj-build-tools/opendj-maven-plugin/src/main/resources/org/opendj/buildtools/maven/check-unit-tests.xml
rename to opendj3/opendj-maven-plugin/src/main/resources/org/opendj/buildtools/maven/check-unit-tests.xml
diff --git a/opendj3/opendj-build-tools/opendj-maven-plugin/src/main/resources/org/opendj/buildtools/maven/opendj.sourceheader b/opendj3/opendj-maven-plugin/src/main/resources/org/opendj/buildtools/maven/opendj.sourceheader
similarity index 100%
rename from opendj3/opendj-build-tools/opendj-maven-plugin/src/main/resources/org/opendj/buildtools/maven/opendj.sourceheader
rename to opendj3/opendj-maven-plugin/src/main/resources/org/opendj/buildtools/maven/opendj.sourceheader
diff --git a/opendj3/opendj-modules/.project b/opendj3/opendj-modules/.project
deleted file mode 100644
index eeb6bb4..0000000
--- a/opendj3/opendj-modules/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>opendj-modules</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </natures>
-</projectDescription>
diff --git a/opendj3/opendj-modules/.settings/org.maven.ide.eclipse.prefs b/opendj3/opendj-modules/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 6e90395..0000000
--- a/opendj3/opendj-modules/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Fri Feb 11 18:59:22 CET 2011
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/opendj3/opendj-modules/pom.xml b/opendj3/opendj-modules/pom.xml
deleted file mode 100644
index 4d464df..0000000
--- a/opendj3/opendj-modules/pom.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ! CDDL HEADER START
- !
- ! The contents of this file are subject to the terms of the
- ! Common Development and Distribution License, Version 1.0 only
- ! (the "License"). You may not use this file except in compliance
- ! with the License.
- !
- ! You can obtain a copy of the license at
- ! trunk/opends/resource/legal-notices/CDDLv1_0.txt
- ! or http://forgerock.org/license/CDDLv1.0.html.
- ! See the License for the specific language governing permissions
- ! and limitations under the License.
- !
- ! When distributing Covered Code, include this CDDL HEADER in each
- ! file and include the License file at
- ! trunk/opends/resource/legal-notices/CDDLv1_0.txt. If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
- ! Portions Copyright [yyyy] [name of copyright owner]
- !
- ! CDDL HEADER END
- !
- ! Copyright 2011 ForgeRock AS
- !
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>opendj-project</artifactId>
- <groupId>org.opendj</groupId>
- <version>3.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>opendj-modules</artifactId>
- <packaging>pom</packaging>
- <name>OpenDJ Modules</name>
- <modules>
- <module>opendj-sdk</module>
- <module>opendj-client-tools</module>
- </modules>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.opendj</groupId>
- <artifactId>opendj-maven-plugin</artifactId>
- <version>${project.version}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.7.2</version>
- <configuration>
- <properties>
- <property>
- <name>useDefaultListeners</name>
- <value>false</value>
- </property>
- <property>
- <name>listener</name>
- <value>org.opendj.buildtools.testng.OpenDJTestListener</value>
- </property>
- </properties>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
- <configuration>
- <show>protected</show>
- <quiet>true</quiet>
- <excludePackageNames>com.*</excludePackageNames>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.6</version>
- <dependencies>
- <dependency>
- <groupId>org.opendj</groupId>
- <artifactId>opendj-maven-plugin</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>process-classes</id>
- <configuration>
- <configLocation>org/opendj/buildtools/maven/check-src.xml</configLocation>
- <headerLocation>org/opendj/buildtools/maven/opendj.sourceheader</headerLocation>
- <consoleOutput>true</consoleOutput>
- <failsOnError>true</failsOnError>
- <linkXRef>false</linkXRef>
- </configuration>
- <phase>process-classes</phase>
- <goals>
- <goal>checkstyle</goal>
- </goals>
- </execution>
- <execution>
- <id>process-test-classes</id>
- <configuration>
- <sourceDirectory>${project.build.testSourceDirectory}</sourceDirectory>
- <configLocation>org/opendj/buildtools/maven/check-unit-tests.xml</configLocation>
- <headerLocation>org/opendj/buildtools/maven/opendj.sourceheader</headerLocation>
- <consoleOutput>true</consoleOutput>
- <failsOnError>true</failsOnError>
- <linkXRef>false</linkXRef>
- </configuration>
- <phase>process-test-classes</phase>
- <goals>
- <goal>checkstyle</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-</project>
diff --git a/opendj3/opendj-modules/opendj-sdk/.classpath b/opendj3/opendj-sdk/.classpath
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/.classpath
rename to opendj3/opendj-sdk/.classpath
diff --git a/opendj3/opendj-modules/opendj-sdk/.project b/opendj3/opendj-sdk/.project
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/.project
rename to opendj3/opendj-sdk/.project
diff --git a/opendj3/opendj-modules/opendj-sdk/.settings/org.eclipse.jdt.core.prefs b/opendj3/opendj-sdk/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/.settings/org.eclipse.jdt.core.prefs
rename to opendj3/opendj-sdk/.settings/org.eclipse.jdt.core.prefs
diff --git a/opendj3/opendj-modules/opendj-sdk/.settings/org.maven.ide.eclipse.prefs b/opendj3/opendj-sdk/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/.settings/org.maven.ide.eclipse.prefs
rename to opendj3/opendj-sdk/.settings/org.maven.ide.eclipse.prefs
diff --git a/opendj3/opendj-modules/opendj-sdk/pom.xml b/opendj3/opendj-sdk/pom.xml
similarity index 98%
rename from opendj3/opendj-modules/opendj-sdk/pom.xml
rename to opendj3/opendj-sdk/pom.xml
index 209f353..a2b5aa6 100644
--- a/opendj3/opendj-modules/opendj-sdk/pom.xml
+++ b/opendj3/opendj-sdk/pom.xml
@@ -29,7 +29,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>opendj-modules</artifactId>
+ <artifactId>opendj-project</artifactId>
<groupId>org.opendj</groupId>
<version>3.0-SNAPSHOT</version>
</parent>
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/AccountUsabilityRequestControl.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/AccountUsabilityRequestControl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/AccountUsabilityRequestControl.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/AccountUsabilityRequestControl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/AccountUsabilityResponseControl.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/AccountUsabilityResponseControl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/AccountUsabilityResponseControl.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/AccountUsabilityResponseControl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/RealAttributesOnlyRequestControl.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/RealAttributesOnlyRequestControl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/RealAttributesOnlyRequestControl.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/RealAttributesOnlyRequestControl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/VirtualAttributesOnlyRequestControl.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/VirtualAttributesOnlyRequestControl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/VirtualAttributesOnlyRequestControl.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/VirtualAttributesOnlyRequestControl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/package-info.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/package-info.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/package-info.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/package-info.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/GetConnectionIDExtendedRequest.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/GetConnectionIDExtendedRequest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/GetConnectionIDExtendedRequest.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/GetConnectionIDExtendedRequest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/GetConnectionIDExtendedResult.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/GetConnectionIDExtendedResult.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/GetConnectionIDExtendedResult.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/GetConnectionIDExtendedResult.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/GetSymmetricKeyExtendedRequest.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/GetSymmetricKeyExtendedRequest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/GetSymmetricKeyExtendedRequest.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/GetSymmetricKeyExtendedRequest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateExtendedRequest.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateExtendedRequest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateExtendedRequest.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateExtendedRequest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateExtendedResult.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateExtendedResult.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateExtendedResult.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateExtendedResult.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateOperation.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateOperation.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateOperation.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateOperation.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateOperationContainer.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateOperationContainer.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateOperationContainer.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateOperationContainer.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateOperationType.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateOperationType.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateOperationType.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateOperationType.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/package-info.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/package-info.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/package-info.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/package-info.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/ASN1BufferReader.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/ASN1BufferReader.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/ASN1BufferReader.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/ASN1BufferReader.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/ASN1BufferWriter.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/ASN1BufferWriter.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/ASN1BufferWriter.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/ASN1BufferWriter.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/AbstractLDAPFutureResultImpl.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/AbstractLDAPFutureResultImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/AbstractLDAPFutureResultImpl.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/AbstractLDAPFutureResultImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/AbstractLDAPMessageHandler.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/AbstractLDAPMessageHandler.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/AbstractLDAPMessageHandler.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/AbstractLDAPMessageHandler.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/InternalConnection.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/InternalConnection.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/InternalConnection.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/InternalConnection.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPBindFutureResultImpl.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPBindFutureResultImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPBindFutureResultImpl.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPBindFutureResultImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPClientFilter.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPClientFilter.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPClientFilter.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPClientFilter.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPCompareFutureResultImpl.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPCompareFutureResultImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPCompareFutureResultImpl.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPCompareFutureResultImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPConnection.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPConnection.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPConnection.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPConnection.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPConnectionFactoryImpl.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPConnectionFactoryImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPConnectionFactoryImpl.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPConnectionFactoryImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPConstants.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPConstants.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPConstants.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPConstants.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPDefaultTCPNIOTransport.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPDefaultTCPNIOTransport.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPDefaultTCPNIOTransport.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPDefaultTCPNIOTransport.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPExtendedFutureResultImpl.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPExtendedFutureResultImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPExtendedFutureResultImpl.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPExtendedFutureResultImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPFutureResultImpl.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPFutureResultImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPFutureResultImpl.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPFutureResultImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPListenerImpl.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPListenerImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPListenerImpl.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPListenerImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPMessageHandler.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPMessageHandler.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPMessageHandler.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPMessageHandler.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPReader.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPReader.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPReader.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPReader.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPSearchFutureResultImpl.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPSearchFutureResultImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPSearchFutureResultImpl.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPSearchFutureResultImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPServerFilter.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPServerFilter.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPServerFilter.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPServerFilter.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPUtils.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPUtils.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPUtils.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPUtils.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPWriter.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPWriter.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPWriter.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPWriter.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/SASLDecoderTransformer.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/SASLDecoderTransformer.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/SASLDecoderTransformer.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/SASLDecoderTransformer.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/SASLEncoderTransformer.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/SASLEncoderTransformer.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/SASLEncoderTransformer.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/SASLEncoderTransformer.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/SASLFilter.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/SASLFilter.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/SASLFilter.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/SASLFilter.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/TimeoutChecker.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/TimeoutChecker.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/TimeoutChecker.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/TimeoutChecker.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/UnexpectedRequestException.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/UnexpectedRequestException.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/UnexpectedRequestException.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/UnexpectedRequestException.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/UnexpectedResponseException.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/UnexpectedResponseException.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/UnexpectedResponseException.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/UnexpectedResponseException.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/UnsupportedMessageException.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/UnsupportedMessageException.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/UnsupportedMessageException.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/UnsupportedMessageException.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/package-info.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/package-info.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/package-info.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/package-info.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/ASCIICharProp.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/ASCIICharProp.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/ASCIICharProp.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/ASCIICharProp.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/AsynchronousConnectionDecorator.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/AsynchronousConnectionDecorator.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/AsynchronousConnectionDecorator.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/AsynchronousConnectionDecorator.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/AsynchronousFutureResult.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/AsynchronousFutureResult.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/AsynchronousFutureResult.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/AsynchronousFutureResult.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Base64.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Base64.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Base64.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Base64.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/ByteSequenceOutputStream.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/ByteSequenceOutputStream.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/ByteSequenceOutputStream.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/ByteSequenceOutputStream.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Collections2.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Collections2.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Collections2.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Collections2.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/CompletedFutureResult.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/CompletedFutureResult.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/CompletedFutureResult.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/CompletedFutureResult.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Function.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Function.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Function.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Function.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Functions.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Functions.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Functions.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Functions.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/FutureResultTransformer.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/FutureResultTransformer.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/FutureResultTransformer.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/FutureResultTransformer.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Iterables.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Iterables.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Iterables.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Iterables.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Iterators.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Iterators.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Iterators.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Iterators.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/LocalizableMessageDescriptor.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/LocalizableMessageDescriptor.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/LocalizableMessageDescriptor.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/LocalizableMessageDescriptor.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Predicate.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Predicate.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Predicate.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Predicate.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/RecursiveFutureResult.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/RecursiveFutureResult.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/RecursiveFutureResult.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/RecursiveFutureResult.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/SizeLimitInputStream.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/SizeLimitInputStream.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/SizeLimitInputStream.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/SizeLimitInputStream.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/StaticUtils.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/StaticUtils.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/StaticUtils.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/StaticUtils.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/StringPrepProfile.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/StringPrepProfile.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/StringPrepProfile.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/StringPrepProfile.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/SubstringReader.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/SubstringReader.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/SubstringReader.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/SubstringReader.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Validator.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Validator.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Validator.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Validator.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/package-info.java b/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/package-info.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/com/sun/opends/sdk/util/package-info.java
rename to opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/package-info.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/AVA.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AVA.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/AVA.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/AVA.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/AbstractAsynchronousConnection.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractAsynchronousConnection.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/AbstractAsynchronousConnection.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractAsynchronousConnection.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/AbstractAttribute.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractAttribute.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/AbstractAttribute.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractAttribute.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/AbstractConnection.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractConnection.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/AbstractConnection.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractConnection.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/AbstractConnectionFactory.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractConnectionFactory.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/AbstractConnectionFactory.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractConnectionFactory.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/AbstractEntry.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractEntry.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/AbstractEntry.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractEntry.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/AbstractFilterVisitor.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractFilterVisitor.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/AbstractFilterVisitor.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractFilterVisitor.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/AbstractLoadBalancingAlgorithm.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractLoadBalancingAlgorithm.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/AbstractLoadBalancingAlgorithm.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractLoadBalancingAlgorithm.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/AbstractMapEntry.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractMapEntry.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/AbstractMapEntry.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractMapEntry.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/Assertion.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/Assertion.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/Assertion.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/Assertion.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/AssertionFailureException.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AssertionFailureException.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/AssertionFailureException.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/AssertionFailureException.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/AsynchronousConnection.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AsynchronousConnection.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/AsynchronousConnection.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/AsynchronousConnection.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/Attribute.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/Attribute.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/Attribute.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/Attribute.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/AttributeDescription.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AttributeDescription.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/AttributeDescription.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/AttributeDescription.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/AttributeFactory.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AttributeFactory.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/AttributeFactory.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/AttributeFactory.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/Attributes.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/Attributes.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/Attributes.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/Attributes.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/AuthenticatedConnectionFactory.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AuthenticatedConnectionFactory.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/AuthenticatedConnectionFactory.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/AuthenticatedConnectionFactory.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/AuthenticationException.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AuthenticationException.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/AuthenticationException.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/AuthenticationException.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/AuthorizationException.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AuthorizationException.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/AuthorizationException.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/AuthorizationException.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ByteSequence.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ByteSequence.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ByteSequence.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/ByteSequence.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ByteSequenceReader.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ByteSequenceReader.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ByteSequenceReader.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/ByteSequenceReader.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ByteString.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ByteString.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ByteString.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/ByteString.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ByteStringBuilder.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ByteStringBuilder.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ByteStringBuilder.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/ByteStringBuilder.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/CancelledResultException.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/CancelledResultException.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/CancelledResultException.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/CancelledResultException.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ConditionResult.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ConditionResult.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ConditionResult.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/ConditionResult.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/Connection.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/Connection.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/Connection.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/Connection.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ConnectionEventListener.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ConnectionEventListener.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ConnectionEventListener.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/ConnectionEventListener.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ConnectionException.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ConnectionException.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ConnectionException.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/ConnectionException.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ConnectionFactory.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ConnectionFactory.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ConnectionFactory.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/ConnectionFactory.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ConnectionPool.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ConnectionPool.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ConnectionPool.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/ConnectionPool.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ConnectionSecurityLayer.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ConnectionSecurityLayer.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ConnectionSecurityLayer.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/ConnectionSecurityLayer.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/Connections.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/Connections.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/Connections.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/Connections.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ConstraintViolationException.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ConstraintViolationException.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ConstraintViolationException.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/ConstraintViolationException.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/DN.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/DN.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/DN.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/DN.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/DecodeException.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/DecodeException.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/DecodeException.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/DecodeException.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/DecodeOptions.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/DecodeOptions.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/DecodeOptions.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/DecodeOptions.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/DereferenceAliasesPolicy.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/DereferenceAliasesPolicy.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/DereferenceAliasesPolicy.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/DereferenceAliasesPolicy.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/Entries.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/Entries.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/Entries.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/Entries.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/Entry.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/Entry.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/Entry.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/Entry.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/EntryFactory.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/EntryFactory.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/EntryFactory.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/EntryFactory.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/EntryNotFoundException.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/EntryNotFoundException.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/EntryNotFoundException.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/EntryNotFoundException.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ErrorResultException.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ErrorResultException.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ErrorResultException.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/ErrorResultException.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ErrorResultIOException.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ErrorResultIOException.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ErrorResultIOException.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/ErrorResultIOException.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/FailoverLoadBalancingAlgorithm.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/FailoverLoadBalancingAlgorithm.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/FailoverLoadBalancingAlgorithm.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/FailoverLoadBalancingAlgorithm.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/Filter.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/Filter.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/Filter.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/Filter.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/FilterVisitor.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/FilterVisitor.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/FilterVisitor.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/FilterVisitor.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/FutureResult.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/FutureResult.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/FutureResult.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/FutureResult.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/HeartBeatConnectionFactory.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/HeartBeatConnectionFactory.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/HeartBeatConnectionFactory.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/HeartBeatConnectionFactory.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/IntermediateResponseHandler.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/IntermediateResponseHandler.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/IntermediateResponseHandler.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/IntermediateResponseHandler.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/InternalConnectionFactory.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/InternalConnectionFactory.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/InternalConnectionFactory.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/InternalConnectionFactory.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/KeyManagers.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/KeyManagers.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/KeyManagers.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/KeyManagers.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/LDAPClientContext.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPClientContext.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/LDAPClientContext.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPClientContext.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/LDAPConnectionFactory.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPConnectionFactory.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/LDAPConnectionFactory.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPConnectionFactory.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/LDAPListener.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPListener.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/LDAPListener.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPListener.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/LDAPListenerOptions.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPListenerOptions.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/LDAPListenerOptions.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPListenerOptions.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/LDAPOptions.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPOptions.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/LDAPOptions.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPOptions.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/LDAPUrl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPUrl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/LDAPUrl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPUrl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/LinkedAttribute.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LinkedAttribute.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/LinkedAttribute.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/LinkedAttribute.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/LinkedHashMapEntry.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LinkedHashMapEntry.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/LinkedHashMapEntry.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/LinkedHashMapEntry.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/LoadBalancer.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LoadBalancer.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/LoadBalancer.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/LoadBalancer.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/LoadBalancingAlgorithm.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LoadBalancingAlgorithm.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/LoadBalancingAlgorithm.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/LoadBalancingAlgorithm.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/LocalizableException.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LocalizableException.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/LocalizableException.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/LocalizableException.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/LocalizableMessage.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LocalizableMessage.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/LocalizableMessage.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/LocalizableMessage.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/LocalizableMessageBuilder.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LocalizableMessageBuilder.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/LocalizableMessageBuilder.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/LocalizableMessageBuilder.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/LocalizedIllegalArgumentException.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LocalizedIllegalArgumentException.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/LocalizedIllegalArgumentException.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/LocalizedIllegalArgumentException.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/Matcher.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/Matcher.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/Matcher.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/Matcher.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/Modification.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/Modification.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/Modification.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/Modification.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ModificationType.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ModificationType.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ModificationType.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/ModificationType.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/MultipleEntriesFoundException.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/MultipleEntriesFoundException.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/MultipleEntriesFoundException.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/MultipleEntriesFoundException.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/RDN.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/RDN.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/RDN.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/RDN.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ReferralException.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ReferralException.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ReferralException.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/ReferralException.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/RequestHandler.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/RequestHandler.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/RequestHandler.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/RequestHandler.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ResultCode.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ResultCode.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ResultCode.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/ResultCode.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ResultHandler.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ResultHandler.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ResultHandler.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/ResultHandler.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/RootDSE.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/RootDSE.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/RootDSE.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/RootDSE.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/RoundRobinLoadBalancingAlgorithm.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/RoundRobinLoadBalancingAlgorithm.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/RoundRobinLoadBalancingAlgorithm.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/RoundRobinLoadBalancingAlgorithm.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/SSLContextBuilder.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/SSLContextBuilder.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/SSLContextBuilder.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/SSLContextBuilder.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/SchemaResolver.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/SchemaResolver.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/SchemaResolver.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/SchemaResolver.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/SearchResultHandler.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/SearchResultHandler.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/SearchResultHandler.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/SearchResultHandler.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/SearchResultReferenceIOException.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/SearchResultReferenceIOException.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/SearchResultReferenceIOException.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/SearchResultReferenceIOException.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/SearchScope.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/SearchScope.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/SearchScope.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/SearchScope.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ServerConnection.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ServerConnection.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ServerConnection.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/ServerConnection.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ServerConnectionFactory.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ServerConnectionFactory.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ServerConnectionFactory.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/ServerConnectionFactory.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/SortKey.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/SortKey.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/SortKey.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/SortKey.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/SynchronousConnection.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/SynchronousConnection.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/SynchronousConnection.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/SynchronousConnection.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/TimeoutResultException.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/TimeoutResultException.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/TimeoutResultException.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/TimeoutResultException.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/TreeMapEntry.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/TreeMapEntry.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/TreeMapEntry.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/TreeMapEntry.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/TrustManagers.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/TrustManagers.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/TrustManagers.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/TrustManagers.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1ByteSequenceReader.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1ByteSequenceReader.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1ByteSequenceReader.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1ByteSequenceReader.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1Constants.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1Constants.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1Constants.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1Constants.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1InputStreamReader.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1InputStreamReader.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1InputStreamReader.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1InputStreamReader.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1OutputStreamWriter.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1OutputStreamWriter.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1OutputStreamWriter.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1OutputStreamWriter.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1Reader.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1Reader.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1Reader.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1Reader.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1Writer.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1Writer.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1Writer.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1Writer.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/asn1/AbstractASN1Reader.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/AbstractASN1Reader.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/asn1/AbstractASN1Reader.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/AbstractASN1Reader.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/asn1/AbstractASN1Writer.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/AbstractASN1Writer.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/asn1/AbstractASN1Writer.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/AbstractASN1Writer.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/asn1/package-info.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/package-info.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/asn1/package-info.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/package-info.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/AssertionRequestControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/AssertionRequestControl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/AssertionRequestControl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/AssertionRequestControl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/AuthorizationIdentityRequestControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/AuthorizationIdentityRequestControl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/AuthorizationIdentityRequestControl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/AuthorizationIdentityRequestControl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/AuthorizationIdentityResponseControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/AuthorizationIdentityResponseControl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/AuthorizationIdentityResponseControl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/AuthorizationIdentityResponseControl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/Control.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/Control.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/Control.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/Control.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/ControlDecoder.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ControlDecoder.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/ControlDecoder.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ControlDecoder.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/EntryChangeNotificationResponseControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/EntryChangeNotificationResponseControl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/EntryChangeNotificationResponseControl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/EntryChangeNotificationResponseControl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/GenericControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/GenericControl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/GenericControl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/GenericControl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/GetEffectiveRightsRequestControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/GetEffectiveRightsRequestControl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/GetEffectiveRightsRequestControl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/GetEffectiveRightsRequestControl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/ManageDsaITRequestControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ManageDsaITRequestControl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/ManageDsaITRequestControl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ManageDsaITRequestControl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/MatchedValuesRequestControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/MatchedValuesRequestControl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/MatchedValuesRequestControl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/MatchedValuesRequestControl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordExpiredResponseControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordExpiredResponseControl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordExpiredResponseControl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordExpiredResponseControl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordExpiringResponseControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordExpiringResponseControl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordExpiringResponseControl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordExpiringResponseControl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordPolicyErrorType.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordPolicyErrorType.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordPolicyErrorType.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordPolicyErrorType.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordPolicyRequestControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordPolicyRequestControl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordPolicyRequestControl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordPolicyRequestControl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordPolicyResponseControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordPolicyResponseControl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordPolicyResponseControl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordPolicyResponseControl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordPolicyWarningType.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordPolicyWarningType.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordPolicyWarningType.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordPolicyWarningType.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/PermissiveModifyRequestControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PermissiveModifyRequestControl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/PermissiveModifyRequestControl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PermissiveModifyRequestControl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/PersistentSearchChangeType.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PersistentSearchChangeType.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/PersistentSearchChangeType.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PersistentSearchChangeType.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/PersistentSearchRequestControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PersistentSearchRequestControl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/PersistentSearchRequestControl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PersistentSearchRequestControl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/PostReadRequestControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PostReadRequestControl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/PostReadRequestControl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PostReadRequestControl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/PostReadResponseControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PostReadResponseControl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/PostReadResponseControl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PostReadResponseControl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/PreReadRequestControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PreReadRequestControl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/PreReadRequestControl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PreReadRequestControl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/PreReadResponseControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PreReadResponseControl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/PreReadResponseControl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PreReadResponseControl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/ProxiedAuthV1RequestControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ProxiedAuthV1RequestControl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/ProxiedAuthV1RequestControl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ProxiedAuthV1RequestControl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/ProxiedAuthV2RequestControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ProxiedAuthV2RequestControl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/ProxiedAuthV2RequestControl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ProxiedAuthV2RequestControl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/ServerSideSortRequestControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ServerSideSortRequestControl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/ServerSideSortRequestControl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ServerSideSortRequestControl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/ServerSideSortResponseControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ServerSideSortResponseControl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/ServerSideSortResponseControl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ServerSideSortResponseControl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/SimplePagedResultsControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/SimplePagedResultsControl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/SimplePagedResultsControl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/SimplePagedResultsControl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/SubentriesRequestControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/SubentriesRequestControl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/SubentriesRequestControl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/SubentriesRequestControl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/SubtreeDeleteRequestControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/SubtreeDeleteRequestControl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/SubtreeDeleteRequestControl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/SubtreeDeleteRequestControl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/VirtualListViewRequestControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/VirtualListViewRequestControl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/VirtualListViewRequestControl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/VirtualListViewRequestControl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/VirtualListViewResponseControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/VirtualListViewResponseControl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/VirtualListViewResponseControl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/VirtualListViewResponseControl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/package-info.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/package-info.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/controls/package-info.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/package-info.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ldif/AbstractLDIFReader.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/AbstractLDIFReader.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ldif/AbstractLDIFReader.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/AbstractLDIFReader.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ldif/AbstractLDIFStream.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/AbstractLDIFStream.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ldif/AbstractLDIFStream.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/AbstractLDIFStream.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ldif/AbstractLDIFWriter.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/AbstractLDIFWriter.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ldif/AbstractLDIFWriter.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/AbstractLDIFWriter.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ldif/ChangeRecord.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ChangeRecord.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ldif/ChangeRecord.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ChangeRecord.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ldif/ChangeRecordReader.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ChangeRecordReader.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ldif/ChangeRecordReader.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ChangeRecordReader.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ldif/ChangeRecordVisitor.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ChangeRecordVisitor.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ldif/ChangeRecordVisitor.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ChangeRecordVisitor.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ldif/ChangeRecordVisitorWriter.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ChangeRecordVisitorWriter.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ldif/ChangeRecordVisitorWriter.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ChangeRecordVisitorWriter.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ldif/ChangeRecordWriter.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ChangeRecordWriter.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ldif/ChangeRecordWriter.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ChangeRecordWriter.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ldif/ConnectionChangeRecordWriter.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ConnectionChangeRecordWriter.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ldif/ConnectionChangeRecordWriter.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ConnectionChangeRecordWriter.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ldif/ConnectionEntryReader.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ConnectionEntryReader.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ldif/ConnectionEntryReader.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ConnectionEntryReader.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ldif/ConnectionEntryWriter.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ConnectionEntryWriter.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ldif/ConnectionEntryWriter.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ConnectionEntryWriter.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ldif/EntryReader.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/EntryReader.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ldif/EntryReader.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/EntryReader.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ldif/EntryWriter.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/EntryWriter.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ldif/EntryWriter.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/EntryWriter.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFChangeRecordReader.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFChangeRecordReader.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFChangeRecordReader.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFChangeRecordReader.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFChangeRecordWriter.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFChangeRecordWriter.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFChangeRecordWriter.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFChangeRecordWriter.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFEntryReader.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFEntryReader.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFEntryReader.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFEntryReader.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFEntryWriter.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFEntryWriter.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFEntryWriter.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFEntryWriter.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ldif/package-info.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/package-info.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/ldif/package-info.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/package-info.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/package-info.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/package-info.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/package-info.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/package-info.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/AbandonRequest.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbandonRequest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/AbandonRequest.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbandonRequest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/AbandonRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbandonRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/AbandonRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbandonRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractBindRequest.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractBindRequest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractBindRequest.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractBindRequest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractExtendedRequest.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractExtendedRequest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractExtendedRequest.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractExtendedRequest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractSASLBindRequest.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractSASLBindRequest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractSASLBindRequest.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractSASLBindRequest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractUnmodifiableBindRequest.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractUnmodifiableBindRequest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractUnmodifiableBindRequest.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractUnmodifiableBindRequest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractUnmodifiableExtendedRequest.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractUnmodifiableExtendedRequest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractUnmodifiableExtendedRequest.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractUnmodifiableExtendedRequest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractUnmodifiableRequest.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractUnmodifiableRequest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractUnmodifiableRequest.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractUnmodifiableRequest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractUnmodifiableSASLBindRequest.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractUnmodifiableSASLBindRequest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractUnmodifiableSASLBindRequest.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractUnmodifiableSASLBindRequest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/AddRequest.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AddRequest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/AddRequest.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AddRequest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/AddRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AddRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/AddRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AddRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/AnonymousSASLBindRequest.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AnonymousSASLBindRequest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/AnonymousSASLBindRequest.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AnonymousSASLBindRequest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/AnonymousSASLBindRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AnonymousSASLBindRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/AnonymousSASLBindRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AnonymousSASLBindRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/BindClient.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/BindClient.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/BindClient.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/BindClient.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/BindClientImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/BindClientImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/BindClientImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/BindClientImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/BindRequest.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/BindRequest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/BindRequest.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/BindRequest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/CRAMMD5SASLBindRequest.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/CRAMMD5SASLBindRequest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/CRAMMD5SASLBindRequest.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/CRAMMD5SASLBindRequest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/CRAMMD5SASLBindRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/CRAMMD5SASLBindRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/CRAMMD5SASLBindRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/CRAMMD5SASLBindRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/CancelExtendedRequest.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/CancelExtendedRequest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/CancelExtendedRequest.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/CancelExtendedRequest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/CancelExtendedRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/CancelExtendedRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/CancelExtendedRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/CancelExtendedRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/CompareRequest.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/CompareRequest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/CompareRequest.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/CompareRequest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/CompareRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/CompareRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/CompareRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/CompareRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/DeleteRequest.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/DeleteRequest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/DeleteRequest.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/DeleteRequest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/DeleteRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/DeleteRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/DeleteRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/DeleteRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/DigestMD5SASLBindRequest.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/DigestMD5SASLBindRequest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/DigestMD5SASLBindRequest.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/DigestMD5SASLBindRequest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/DigestMD5SASLBindRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/DigestMD5SASLBindRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/DigestMD5SASLBindRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/DigestMD5SASLBindRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/ExtendedRequest.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/ExtendedRequest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/ExtendedRequest.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/ExtendedRequest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/ExtendedRequestDecoder.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/ExtendedRequestDecoder.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/ExtendedRequestDecoder.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/ExtendedRequestDecoder.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/ExternalSASLBindRequest.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/ExternalSASLBindRequest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/ExternalSASLBindRequest.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/ExternalSASLBindRequest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/ExternalSASLBindRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/ExternalSASLBindRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/ExternalSASLBindRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/ExternalSASLBindRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/GSSAPISASLBindRequest.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/GSSAPISASLBindRequest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/GSSAPISASLBindRequest.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/GSSAPISASLBindRequest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/GSSAPISASLBindRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/GSSAPISASLBindRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/GSSAPISASLBindRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/GSSAPISASLBindRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/GenericBindRequest.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/GenericBindRequest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/GenericBindRequest.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/GenericBindRequest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/GenericBindRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/GenericBindRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/GenericBindRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/GenericBindRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/GenericExtendedRequest.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/GenericExtendedRequest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/GenericExtendedRequest.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/GenericExtendedRequest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/GenericExtendedRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/GenericExtendedRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/GenericExtendedRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/GenericExtendedRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/ModifyDNRequest.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/ModifyDNRequest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/ModifyDNRequest.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/ModifyDNRequest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/ModifyDNRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/ModifyDNRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/ModifyDNRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/ModifyDNRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/ModifyRequest.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/ModifyRequest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/ModifyRequest.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/ModifyRequest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/ModifyRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/ModifyRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/ModifyRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/ModifyRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/PasswordModifyExtendedRequest.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/PasswordModifyExtendedRequest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/PasswordModifyExtendedRequest.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/PasswordModifyExtendedRequest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/PasswordModifyExtendedRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/PasswordModifyExtendedRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/PasswordModifyExtendedRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/PasswordModifyExtendedRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/PlainSASLBindRequest.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/PlainSASLBindRequest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/PlainSASLBindRequest.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/PlainSASLBindRequest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/PlainSASLBindRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/PlainSASLBindRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/PlainSASLBindRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/PlainSASLBindRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/Request.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/Request.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/Request.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/Request.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/Requests.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/Requests.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/Requests.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/Requests.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/SASLBindClientImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/SASLBindClientImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/SASLBindClientImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/SASLBindClientImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/SASLBindRequest.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/SASLBindRequest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/SASLBindRequest.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/SASLBindRequest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/SearchRequest.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/SearchRequest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/SearchRequest.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/SearchRequest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/SearchRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/SearchRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/SearchRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/SearchRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/SimpleBindRequest.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/SimpleBindRequest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/SimpleBindRequest.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/SimpleBindRequest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/SimpleBindRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/SimpleBindRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/SimpleBindRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/SimpleBindRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/StartTLSExtendedRequest.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/StartTLSExtendedRequest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/StartTLSExtendedRequest.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/StartTLSExtendedRequest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/StartTLSExtendedRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/StartTLSExtendedRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/StartTLSExtendedRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/StartTLSExtendedRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnbindRequest.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnbindRequest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnbindRequest.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnbindRequest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnbindRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnbindRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnbindRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnbindRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableAbandonRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableAbandonRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableAbandonRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableAbandonRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableAddRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableAddRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableAddRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableAddRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableAnonymousSASLBindRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableAnonymousSASLBindRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableAnonymousSASLBindRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableAnonymousSASLBindRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableCRAMMD5SASLBindRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableCRAMMD5SASLBindRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableCRAMMD5SASLBindRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableCRAMMD5SASLBindRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableCancelExtendedRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableCancelExtendedRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableCancelExtendedRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableCancelExtendedRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableCompareRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableCompareRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableCompareRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableCompareRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableDeleteRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableDeleteRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableDeleteRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableDeleteRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableDigestMD5SASLBindRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableDigestMD5SASLBindRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableDigestMD5SASLBindRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableDigestMD5SASLBindRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableExternalSASLBindRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableExternalSASLBindRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableExternalSASLBindRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableExternalSASLBindRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableGSSAPISASLBindRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableGSSAPISASLBindRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableGSSAPISASLBindRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableGSSAPISASLBindRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableGenericBindRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableGenericBindRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableGenericBindRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableGenericBindRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableGenericExtendedRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableGenericExtendedRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableGenericExtendedRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableGenericExtendedRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableModifyDNRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableModifyDNRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableModifyDNRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableModifyDNRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableModifyRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableModifyRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableModifyRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableModifyRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiablePasswordModifyExtendedRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiablePasswordModifyExtendedRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiablePasswordModifyExtendedRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiablePasswordModifyExtendedRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiablePlainSASLBindRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiablePlainSASLBindRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiablePlainSASLBindRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiablePlainSASLBindRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableSearchRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableSearchRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableSearchRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableSearchRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableSimpleBindRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableSimpleBindRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableSimpleBindRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableSimpleBindRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableStartTLSExtendedRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableStartTLSExtendedRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableStartTLSExtendedRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableStartTLSExtendedRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableUnbindRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableUnbindRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableUnbindRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableUnbindRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableWhoAmIExtendedRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableWhoAmIExtendedRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableWhoAmIExtendedRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableWhoAmIExtendedRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/WhoAmIExtendedRequest.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/WhoAmIExtendedRequest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/WhoAmIExtendedRequest.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/WhoAmIExtendedRequest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/WhoAmIExtendedRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/WhoAmIExtendedRequestImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/WhoAmIExtendedRequestImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/WhoAmIExtendedRequestImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/package-info.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/package-info.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/requests/package-info.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/package-info.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractExtendedResult.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractExtendedResult.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractExtendedResult.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractExtendedResult.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractExtendedResultDecoder.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractExtendedResultDecoder.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractExtendedResultDecoder.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractExtendedResultDecoder.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractIntermediateResponse.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractIntermediateResponse.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractIntermediateResponse.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractIntermediateResponse.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractResponseImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractResponseImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractResponseImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractResponseImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractResultImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractResultImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractResultImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractResultImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractUnmodifiableExtendedResultImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractUnmodifiableExtendedResultImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractUnmodifiableExtendedResultImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractUnmodifiableExtendedResultImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractUnmodifiableIntermediateResponseImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractUnmodifiableIntermediateResponseImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractUnmodifiableIntermediateResponseImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractUnmodifiableIntermediateResponseImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractUnmodifiableResponseImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractUnmodifiableResponseImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractUnmodifiableResponseImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractUnmodifiableResponseImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractUnmodifiableResultImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractUnmodifiableResultImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractUnmodifiableResultImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractUnmodifiableResultImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/BindResult.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/BindResult.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/BindResult.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/BindResult.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/BindResultImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/BindResultImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/BindResultImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/BindResultImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/CompareResult.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/CompareResult.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/CompareResult.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/CompareResult.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/CompareResultImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/CompareResultImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/CompareResultImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/CompareResultImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/ExtendedResult.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/ExtendedResult.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/ExtendedResult.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/ExtendedResult.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/ExtendedResultDecoder.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/ExtendedResultDecoder.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/ExtendedResultDecoder.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/ExtendedResultDecoder.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/GenericExtendedResult.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/GenericExtendedResult.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/GenericExtendedResult.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/GenericExtendedResult.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/GenericExtendedResultImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/GenericExtendedResultImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/GenericExtendedResultImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/GenericExtendedResultImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/GenericIntermediateResponse.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/GenericIntermediateResponse.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/GenericIntermediateResponse.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/GenericIntermediateResponse.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/GenericIntermediateResponseImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/GenericIntermediateResponseImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/GenericIntermediateResponseImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/GenericIntermediateResponseImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/IntermediateResponse.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/IntermediateResponse.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/IntermediateResponse.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/IntermediateResponse.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/PasswordModifyExtendedResult.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/PasswordModifyExtendedResult.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/PasswordModifyExtendedResult.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/PasswordModifyExtendedResult.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/PasswordModifyExtendedResultImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/PasswordModifyExtendedResultImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/PasswordModifyExtendedResultImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/PasswordModifyExtendedResultImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/Response.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/Response.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/Response.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/Response.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/Responses.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/Responses.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/Responses.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/Responses.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/Result.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/Result.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/Result.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/Result.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/ResultImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/ResultImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/ResultImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/ResultImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/SearchResultEntry.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/SearchResultEntry.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/SearchResultEntry.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/SearchResultEntry.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/SearchResultEntryImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/SearchResultEntryImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/SearchResultEntryImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/SearchResultEntryImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/SearchResultReference.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/SearchResultReference.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/SearchResultReference.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/SearchResultReference.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/SearchResultReferenceImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/SearchResultReferenceImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/SearchResultReferenceImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/SearchResultReferenceImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableBindResultImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableBindResultImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableBindResultImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableBindResultImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableCompareResultImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableCompareResultImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableCompareResultImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableCompareResultImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableGenericExtendedResultImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableGenericExtendedResultImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableGenericExtendedResultImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableGenericExtendedResultImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableGenericIntermediateResponseImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableGenericIntermediateResponseImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableGenericIntermediateResponseImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableGenericIntermediateResponseImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiablePasswordModifyExtendedResultImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiablePasswordModifyExtendedResultImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiablePasswordModifyExtendedResultImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiablePasswordModifyExtendedResultImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableResultImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableResultImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableResultImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableResultImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableSearchResultEntryImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableSearchResultEntryImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableSearchResultEntryImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableSearchResultEntryImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableSearchResultReferenceImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableSearchResultReferenceImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableSearchResultReferenceImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableSearchResultReferenceImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableWhoAmIExtendedResultImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableWhoAmIExtendedResultImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableWhoAmIExtendedResultImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableWhoAmIExtendedResultImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/WhoAmIExtendedResult.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/WhoAmIExtendedResult.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/WhoAmIExtendedResult.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/WhoAmIExtendedResult.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/WhoAmIExtendedResultImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/WhoAmIExtendedResultImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/WhoAmIExtendedResultImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/WhoAmIExtendedResultImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/package-info.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/package-info.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/responses/package-info.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/package-info.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/AbstractMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AbstractMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/AbstractMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AbstractMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/AbstractOrderingMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AbstractOrderingMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/AbstractOrderingMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AbstractOrderingMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/AbstractSubstringMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AbstractSubstringMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/AbstractSubstringMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AbstractSubstringMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/AbstractSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AbstractSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/AbstractSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AbstractSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/AttributeType.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AttributeType.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/AttributeType.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AttributeType.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/AttributeTypeSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AttributeTypeSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/AttributeTypeSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AttributeTypeSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/AttributeUsage.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AttributeUsage.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/AttributeUsage.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AttributeUsage.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/AuthPasswordExactEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AuthPasswordExactEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/AuthPasswordExactEqualityMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AuthPasswordExactEqualityMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/AuthPasswordSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AuthPasswordSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/AuthPasswordSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AuthPasswordSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/BinarySyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/BinarySyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/BinarySyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/BinarySyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/BitStringEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/BitStringEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/BitStringEqualityMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/BitStringEqualityMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/BitStringSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/BitStringSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/BitStringSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/BitStringSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/BooleanEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/BooleanEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/BooleanEqualityMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/BooleanEqualityMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/BooleanSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/BooleanSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/BooleanSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/BooleanSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactEqualityMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactEqualityMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactIA5EqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactIA5EqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactIA5EqualityMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactIA5EqualityMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactIA5SubstringMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactIA5SubstringMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactIA5SubstringMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactIA5SubstringMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactOrderingMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactOrderingMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactOrderingMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactOrderingMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactSubstringMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactSubstringMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactSubstringMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactSubstringMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreEqualityMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreEqualityMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreIA5EqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreIA5EqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreIA5EqualityMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreIA5EqualityMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreIA5SubstringMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreIA5SubstringMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreIA5SubstringMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreIA5SubstringMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreListEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreListEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreListEqualityMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreListEqualityMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreListSubstringMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreListSubstringMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreListSubstringMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreListSubstringMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreOrderingMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreOrderingMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreOrderingMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreOrderingMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreSubstringMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreSubstringMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreSubstringMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreSubstringMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/CertificateListSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CertificateListSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/CertificateListSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CertificateListSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/CertificatePairSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CertificatePairSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/CertificatePairSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CertificatePairSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/CertificateSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CertificateSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/CertificateSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CertificateSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/ConflictingSchemaElementException.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ConflictingSchemaElementException.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/ConflictingSchemaElementException.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ConflictingSchemaElementException.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/CoreSchema.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CoreSchema.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/CoreSchema.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CoreSchema.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/CoreSchemaImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CoreSchemaImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/CoreSchemaImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CoreSchemaImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/CountryStringSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CountryStringSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/CountryStringSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CountryStringSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/DITContentRule.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DITContentRule.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/DITContentRule.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DITContentRule.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/DITContentRuleSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DITContentRuleSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/DITContentRuleSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DITContentRuleSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/DITStructureRule.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DITStructureRule.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/DITStructureRule.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DITStructureRule.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/DITStructureRuleSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DITStructureRuleSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/DITStructureRuleSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DITStructureRuleSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/DeliveryMethodSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DeliveryMethodSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/DeliveryMethodSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DeliveryMethodSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/DirectoryStringSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DirectoryStringSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/DirectoryStringSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DirectoryStringSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/DistinguishedNameEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DistinguishedNameEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/DistinguishedNameEqualityMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DistinguishedNameEqualityMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/DistinguishedNameSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DistinguishedNameSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/DistinguishedNameSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DistinguishedNameSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/EnhancedGuideSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/EnhancedGuideSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/EnhancedGuideSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/EnhancedGuideSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/EnumOrderingMatchingRule.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/EnumOrderingMatchingRule.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/EnumOrderingMatchingRule.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/EnumOrderingMatchingRule.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/EnumSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/EnumSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/EnumSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/EnumSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/EqualLengthApproximateMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/EqualLengthApproximateMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/EqualLengthApproximateMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/EqualLengthApproximateMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/FacsimileNumberSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/FacsimileNumberSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/FacsimileNumberSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/FacsimileNumberSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/FaxSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/FaxSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/FaxSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/FaxSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/GeneralizedTimeEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/GeneralizedTimeEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/GeneralizedTimeEqualityMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/GeneralizedTimeEqualityMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/GeneralizedTimeOrderingMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/GeneralizedTimeOrderingMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/GeneralizedTimeOrderingMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/GeneralizedTimeOrderingMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/GeneralizedTimeSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/GeneralizedTimeSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/GeneralizedTimeSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/GeneralizedTimeSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/GenerateCoreSchema.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/GenerateCoreSchema.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/GenerateCoreSchema.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/GenerateCoreSchema.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/GuideSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/GuideSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/GuideSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/GuideSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/IA5StringSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/IA5StringSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/IA5StringSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/IA5StringSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/IntegerEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/IntegerEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/IntegerEqualityMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/IntegerEqualityMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/IntegerOrderingMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/IntegerOrderingMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/IntegerOrderingMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/IntegerOrderingMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/IntegerSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/IntegerSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/IntegerSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/IntegerSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/JPEGSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/JPEGSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/JPEGSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/JPEGSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/KeywordEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/KeywordEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/KeywordEqualityMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/KeywordEqualityMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/LDAPSyntaxDescriptionSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/LDAPSyntaxDescriptionSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/LDAPSyntaxDescriptionSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/LDAPSyntaxDescriptionSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRule.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRule.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRule.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRule.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRuleSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRuleSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRuleSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRuleSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRuleUse.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRuleUse.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRuleUse.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRuleUse.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRuleUseSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRuleUseSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRuleUseSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRuleUseSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/NameAndOptionalUIDSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NameAndOptionalUIDSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/NameAndOptionalUIDSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NameAndOptionalUIDSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/NameForm.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NameForm.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/NameForm.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NameForm.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/NameFormSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NameFormSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/NameFormSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NameFormSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringEqualityMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringEqualityMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringOrderingMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringOrderingMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringOrderingMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringOrderingMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringSubstringMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringSubstringMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringSubstringMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringSubstringMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/OIDSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/OIDSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/OIDSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/OIDSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectClass.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectClass.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectClass.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectClass.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectClassSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectClassSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectClassSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectClassSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectClassType.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectClassType.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectClassType.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectClassType.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectIdentifierEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectIdentifierEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectIdentifierEqualityMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectIdentifierEqualityMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/OctetStringEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/OctetStringEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/OctetStringEqualityMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/OctetStringEqualityMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/OctetStringOrderingMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/OctetStringOrderingMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/OctetStringOrderingMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/OctetStringOrderingMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/OctetStringSubstringMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/OctetStringSubstringMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/OctetStringSubstringMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/OctetStringSubstringMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/OctetStringSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/OctetStringSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/OctetStringSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/OctetStringSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/OtherMailboxSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/OtherMailboxSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/OtherMailboxSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/OtherMailboxSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/PostalAddressSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/PostalAddressSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/PostalAddressSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/PostalAddressSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/PresentationAddressEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/PresentationAddressEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/PresentationAddressEqualityMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/PresentationAddressEqualityMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/PresentationAddressSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/PresentationAddressSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/PresentationAddressSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/PresentationAddressSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/PrintableStringSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/PrintableStringSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/PrintableStringSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/PrintableStringSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/ProtocolInformationEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ProtocolInformationEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/ProtocolInformationEqualityMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ProtocolInformationEqualityMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/ProtocolInformationSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ProtocolInformationSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/ProtocolInformationSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ProtocolInformationSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/RegexSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/RegexSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/RegexSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/RegexSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/Schema.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/Schema.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/Schema.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/Schema.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaBuilder.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaBuilder.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaBuilder.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaBuilder.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaCompatOptions.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaCompatOptions.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaCompatOptions.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaCompatOptions.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaConstants.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaConstants.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaConstants.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaConstants.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaElement.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaElement.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaElement.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaElement.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaException.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaException.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaException.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaException.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaUtils.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaUtils.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaUtils.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaUtils.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/SubstringAssertionSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SubstringAssertionSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/SubstringAssertionSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SubstringAssertionSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/SupportedAlgorithmSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SupportedAlgorithmSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/SupportedAlgorithmSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SupportedAlgorithmSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/Syntax.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/Syntax.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/Syntax.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/Syntax.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/SyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/SyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/TelephoneNumberEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/TelephoneNumberEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/TelephoneNumberEqualityMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/TelephoneNumberEqualityMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/TelephoneNumberSubstringMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/TelephoneNumberSubstringMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/TelephoneNumberSubstringMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/TelephoneNumberSubstringMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/TelephoneNumberSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/TelephoneNumberSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/TelephoneNumberSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/TelephoneNumberSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/TeletexTerminalIdentifierSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/TeletexTerminalIdentifierSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/TeletexTerminalIdentifierSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/TeletexTerminalIdentifierSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/TelexNumberSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/TelexNumberSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/TelexNumberSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/TelexNumberSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/UTCTimeSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UTCTimeSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/UTCTimeSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UTCTimeSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/UUIDEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UUIDEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/UUIDEqualityMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UUIDEqualityMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/UUIDOrderingMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UUIDOrderingMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/UUIDOrderingMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UUIDOrderingMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/UUIDSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UUIDSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/UUIDSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UUIDSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/UniqueMemberEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UniqueMemberEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/UniqueMemberEqualityMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UniqueMemberEqualityMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/UnknownSchemaElementException.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UnknownSchemaElementException.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/UnknownSchemaElementException.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UnknownSchemaElementException.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/UserPasswordExactEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UserPasswordExactEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/UserPasswordExactEqualityMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UserPasswordExactEqualityMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/UserPasswordSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UserPasswordSyntaxImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/UserPasswordSyntaxImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UserPasswordSyntaxImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/WordEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/WordEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/WordEqualityMatchingRuleImpl.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/WordEqualityMatchingRuleImpl.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/package-info.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/package-info.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/java/org/opends/sdk/schema/package-info.java
rename to opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/package-info.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/javadoc/overview.html b/opendj3/opendj-sdk/src/main/javadoc/overview.html
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/javadoc/overview.html
rename to opendj3/opendj-sdk/src/main/javadoc/overview.html
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages.properties b/opendj3/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages.properties
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages.properties
rename to opendj3/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages.properties
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_de.properties b/opendj3/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_de.properties
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_de.properties
rename to opendj3/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_de.properties
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_es.properties b/opendj3/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_es.properties
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_es.properties
rename to opendj3/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_es.properties
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_fr.properties b/opendj3/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_fr.properties
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_fr.properties
rename to opendj3/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_fr.properties
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_ja.properties b/opendj3/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_ja.properties
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_ja.properties
rename to opendj3/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_ja.properties
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_ko.properties b/opendj3/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_ko.properties
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_ko.properties
rename to opendj3/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_ko.properties
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_zh_CN.properties b/opendj3/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_zh_CN.properties
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_zh_CN.properties
rename to opendj3/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_zh_CN.properties
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_zh_TW.properties b/opendj3/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_zh_TW.properties
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_zh_TW.properties
rename to opendj3/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_zh_TW.properties
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/com/sun/opends/sdk/controls/AccountUsabilityRequestControlTestCase.java b/opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/controls/AccountUsabilityRequestControlTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/com/sun/opends/sdk/controls/AccountUsabilityRequestControlTestCase.java
rename to opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/controls/AccountUsabilityRequestControlTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/com/sun/opends/sdk/controls/AccountUsabilityResponseControlTestCase.java b/opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/controls/AccountUsabilityResponseControlTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/com/sun/opends/sdk/controls/AccountUsabilityResponseControlTestCase.java
rename to opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/controls/AccountUsabilityResponseControlTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/ASN1BufferReaderTestCase.java b/opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/ASN1BufferReaderTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/ASN1BufferReaderTestCase.java
rename to opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/ASN1BufferReaderTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/ASN1BufferWriterTestCase.java b/opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/ASN1BufferWriterTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/ASN1BufferWriterTestCase.java
rename to opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/ASN1BufferWriterTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/LDAPDefaultTCPNIOTransportTestCase.java b/opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/LDAPDefaultTCPNIOTransportTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/LDAPDefaultTCPNIOTransportTestCase.java
rename to opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/LDAPDefaultTCPNIOTransportTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/LDAPTestCase.java b/opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/LDAPTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/LDAPTestCase.java
rename to opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/LDAPTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/com/sun/opends/sdk/util/ASCIICharPropTestCase.java b/opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/util/ASCIICharPropTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/com/sun/opends/sdk/util/ASCIICharPropTestCase.java
rename to opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/util/ASCIICharPropTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/com/sun/opends/sdk/util/Base64TestCase.java b/opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/util/Base64TestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/com/sun/opends/sdk/util/Base64TestCase.java
rename to opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/util/Base64TestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/com/sun/opends/sdk/util/StaticUtilsTestCase.java b/opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/util/StaticUtilsTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/com/sun/opends/sdk/util/StaticUtilsTestCase.java
rename to opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/util/StaticUtilsTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/com/sun/opends/sdk/util/StringPrepProfileTestCase.java b/opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/util/StringPrepProfileTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/com/sun/opends/sdk/util/StringPrepProfileTestCase.java
rename to opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/util/StringPrepProfileTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/com/sun/opends/sdk/util/UtilTestCase.java b/opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/util/UtilTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/com/sun/opends/sdk/util/UtilTestCase.java
rename to opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/util/UtilTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/AttributeDescriptionTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/AttributeDescriptionTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/AttributeDescriptionTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/AttributeDescriptionTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/ByteSequenceTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/ByteSequenceTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/ByteSequenceTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/ByteSequenceTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/ByteStringBuilderTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/ByteStringBuilderTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/ByteStringBuilderTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/ByteStringBuilderTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/ByteStringTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/ByteStringTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/ByteStringTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/ByteStringTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/ConnectionFactoryTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/ConnectionFactoryTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/ConnectionFactoryTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/ConnectionFactoryTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/DNTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/DNTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/DNTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/DNTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/EntriesTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/EntriesTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/EntriesTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/EntriesTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/EntryTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/EntryTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/EntryTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/EntryTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/FilterTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/FilterTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/FilterTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/FilterTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/LDAPListenerTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/LDAPListenerTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/LDAPListenerTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/LDAPListenerTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/LDAPServer.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/LDAPServer.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/LDAPServer.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/LDAPServer.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/LDAPUrlTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/LDAPUrlTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/LDAPUrlTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/LDAPUrlTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/LinkedAttributeTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/LinkedAttributeTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/LinkedAttributeTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/LinkedAttributeTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/RDNTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/RDNTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/RDNTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/RDNTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/SdkTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/SdkTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/SdkTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/SdkTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/SynchronousConnectionTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/SynchronousConnectionTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/SynchronousConnectionTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/SynchronousConnectionTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/TestCaseUtils.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/TestCaseUtils.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/TestCaseUtils.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/TestCaseUtils.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/TypesTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/TypesTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/TypesTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/TypesTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1ByteSequenceReaderTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1ByteSequenceReaderTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1ByteSequenceReaderTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1ByteSequenceReaderTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1InputStreamReaderTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1InputStreamReaderTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1InputStreamReaderTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1InputStreamReaderTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1OutputStreamWriterTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1OutputStreamWriterTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1OutputStreamWriterTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1OutputStreamWriterTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1ReaderTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1ReaderTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1ReaderTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1ReaderTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1WriterTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1WriterTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1WriterTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1WriterTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/controls/ControlsTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/controls/ControlsTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/controls/ControlsTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/controls/ControlsTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/ldif/LDIFEntryReaderTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/ldif/LDIFEntryReaderTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/ldif/LDIFEntryReaderTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/ldif/LDIFEntryReaderTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/ldif/LDIFEntryWriterTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/ldif/LDIFEntryWriterTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/ldif/LDIFEntryWriterTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/ldif/LDIFEntryWriterTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/ldif/LDIFTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/ldif/LDIFTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/ldif/LDIFTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/ldif/LDIFTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/AbandonRequestTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/AbandonRequestTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/AbandonRequestTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/AbandonRequestTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/AddRequestTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/AddRequestTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/AddRequestTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/AddRequestTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/AnonymousSASLBindRequestTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/AnonymousSASLBindRequestTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/AnonymousSASLBindRequestTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/AnonymousSASLBindRequestTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/BindRequestTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/BindRequestTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/BindRequestTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/BindRequestTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/CRAMMD5SASLBindRequestTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/CRAMMD5SASLBindRequestTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/CRAMMD5SASLBindRequestTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/CRAMMD5SASLBindRequestTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/CompareRequestTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/CompareRequestTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/CompareRequestTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/CompareRequestTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/DeleteRequestTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/DeleteRequestTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/DeleteRequestTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/DeleteRequestTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/DigestMD5SASLBindRequestTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/DigestMD5SASLBindRequestTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/DigestMD5SASLBindRequestTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/DigestMD5SASLBindRequestTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/ExtendedRequestTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/ExtendedRequestTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/ExtendedRequestTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/ExtendedRequestTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/ExternalSASLBindRequestTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/ExternalSASLBindRequestTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/ExternalSASLBindRequestTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/ExternalSASLBindRequestTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/GSSAPISASLBindRequestTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/GSSAPISASLBindRequestTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/GSSAPISASLBindRequestTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/GSSAPISASLBindRequestTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/GenericBindRequestTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/GenericBindRequestTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/GenericBindRequestTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/GenericBindRequestTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/ModifyDNRequestTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/ModifyDNRequestTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/ModifyDNRequestTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/ModifyDNRequestTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/ModifyRequestTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/ModifyRequestTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/ModifyRequestTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/ModifyRequestTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/PlainSASLBindRequestTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/PlainSASLBindRequestTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/PlainSASLBindRequestTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/PlainSASLBindRequestTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/RequestTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/RequestTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/RequestTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/RequestTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/RequestsTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/RequestsTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/RequestsTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/RequestsTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/SimpleBindRequestTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/SimpleBindRequestTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/SimpleBindRequestTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/SimpleBindRequestTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/UnbindRequestTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/UnbindRequestTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/UnbindRequestTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/UnbindRequestTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/responses/ResponsesTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/responses/ResponsesTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/responses/ResponsesTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/responses/ResponsesTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/AbstractSchemaElementTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/AbstractSchemaElementTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/AbstractSchemaElementTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/AbstractSchemaElementTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/ApproximateMatchingRuleTest.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/ApproximateMatchingRuleTest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/ApproximateMatchingRuleTest.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/ApproximateMatchingRuleTest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/AttributeTypeSyntaxTest.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/AttributeTypeSyntaxTest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/AttributeTypeSyntaxTest.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/AttributeTypeSyntaxTest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/AttributeTypeTest.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/AttributeTypeTest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/AttributeTypeTest.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/AttributeTypeTest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/BitStringEqualityMatchingRuleTest.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/BitStringEqualityMatchingRuleTest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/BitStringEqualityMatchingRuleTest.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/BitStringEqualityMatchingRuleTest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/BitStringSyntaxTest.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/BitStringSyntaxTest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/BitStringSyntaxTest.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/BitStringSyntaxTest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/BooleanEqualityMatchingRuleTest.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/BooleanEqualityMatchingRuleTest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/BooleanEqualityMatchingRuleTest.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/BooleanEqualityMatchingRuleTest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseExactEqualityMatchingRuleTest.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseExactEqualityMatchingRuleTest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseExactEqualityMatchingRuleTest.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseExactEqualityMatchingRuleTest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseExactIA5EqualityMatchingRuleTest.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseExactIA5EqualityMatchingRuleTest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseExactIA5EqualityMatchingRuleTest.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseExactIA5EqualityMatchingRuleTest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseExactIA5SubstringMatchingRuleTest.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseExactIA5SubstringMatchingRuleTest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseExactIA5SubstringMatchingRuleTest.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseExactIA5SubstringMatchingRuleTest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseExactOrderingMatchingRuleTest.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseExactOrderingMatchingRuleTest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseExactOrderingMatchingRuleTest.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseExactOrderingMatchingRuleTest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseExactSubstringMatchingRuleTest.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseExactSubstringMatchingRuleTest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseExactSubstringMatchingRuleTest.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseExactSubstringMatchingRuleTest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseIgnoreEqualityMatchingRuleTest.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseIgnoreEqualityMatchingRuleTest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseIgnoreEqualityMatchingRuleTest.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseIgnoreEqualityMatchingRuleTest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseIgnoreIA5EqualityMatchingRuleTest.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseIgnoreIA5EqualityMatchingRuleTest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseIgnoreIA5EqualityMatchingRuleTest.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseIgnoreIA5EqualityMatchingRuleTest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseIgnoreOrderingMatchingRuleTest.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseIgnoreOrderingMatchingRuleTest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseIgnoreOrderingMatchingRuleTest.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseIgnoreOrderingMatchingRuleTest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseIgnoreSubstringMatchingRuleTest.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseIgnoreSubstringMatchingRuleTest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseIgnoreSubstringMatchingRuleTest.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/CaseIgnoreSubstringMatchingRuleTest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/CoreSchemaTest.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/CoreSchemaTest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/CoreSchemaTest.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/CoreSchemaTest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/DITContentRuleSyntaxTest.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/DITContentRuleSyntaxTest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/DITContentRuleSyntaxTest.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/DITContentRuleSyntaxTest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/DistinguishedNameEqualityMatchingRuleTest.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/DistinguishedNameEqualityMatchingRuleTest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/DistinguishedNameEqualityMatchingRuleTest.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/DistinguishedNameEqualityMatchingRuleTest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/EnumSyntaxTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/EnumSyntaxTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/EnumSyntaxTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/EnumSyntaxTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/GeneralizedTimeSyntaxTest.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/GeneralizedTimeSyntaxTest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/GeneralizedTimeSyntaxTest.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/GeneralizedTimeSyntaxTest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/GuideSyntaxTest.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/GuideSyntaxTest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/GuideSyntaxTest.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/GuideSyntaxTest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/IA5StringSyntaxTest.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/IA5StringSyntaxTest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/IA5StringSyntaxTest.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/IA5StringSyntaxTest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/LDAPSyntaxTest.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/LDAPSyntaxTest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/LDAPSyntaxTest.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/LDAPSyntaxTest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/MatchingRuleSyntaxTest.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/MatchingRuleSyntaxTest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/MatchingRuleSyntaxTest.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/MatchingRuleSyntaxTest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/MatchingRuleTest.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/MatchingRuleTest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/MatchingRuleTest.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/MatchingRuleTest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/MatchingRuleUseSyntaxTest.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/MatchingRuleUseSyntaxTest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/MatchingRuleUseSyntaxTest.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/MatchingRuleUseSyntaxTest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/OrderingMatchingRuleTest.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/OrderingMatchingRuleTest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/OrderingMatchingRuleTest.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/OrderingMatchingRuleTest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/OtherMailboxSyntaxTest.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/OtherMailboxSyntaxTest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/OtherMailboxSyntaxTest.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/OtherMailboxSyntaxTest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/RegexSyntaxTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/RegexSyntaxTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/RegexSyntaxTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/RegexSyntaxTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/SchemaTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/SchemaTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/SchemaTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/SchemaTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/SchemaUtilsTest.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/SchemaUtilsTest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/SchemaUtilsTest.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/SchemaUtilsTest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/SubstitutionSyntaxTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/SubstitutionSyntaxTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/SubstitutionSyntaxTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/SubstitutionSyntaxTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/SubstringMatchingRuleTest.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/SubstringMatchingRuleTest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/SubstringMatchingRuleTest.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/SubstringMatchingRuleTest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/SyntaxTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/SyntaxTestCase.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/SyntaxTestCase.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/SyntaxTestCase.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/TelexSyntaxTest.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/TelexSyntaxTest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/TelexSyntaxTest.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/TelexSyntaxTest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/UTCTimeSyntaxTest.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/UTCTimeSyntaxTest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/UTCTimeSyntaxTest.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/UTCTimeSyntaxTest.java
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/UUIDSyntaxTest.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/UUIDSyntaxTest.java
similarity index 100%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/UUIDSyntaxTest.java
rename to opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/UUIDSyntaxTest.java
diff --git a/opendj3/opendj-build-tools/opendj-testng-support/.classpath b/opendj3/opendj-testng-support/.classpath
similarity index 100%
rename from opendj3/opendj-build-tools/opendj-testng-support/.classpath
rename to opendj3/opendj-testng-support/.classpath
diff --git a/opendj3/opendj-build-tools/opendj-testng-support/.project b/opendj3/opendj-testng-support/.project
similarity index 100%
rename from opendj3/opendj-build-tools/opendj-testng-support/.project
rename to opendj3/opendj-testng-support/.project
diff --git a/opendj3/opendj-build-tools/opendj-testng-support/.settings/org.eclipse.jdt.core.prefs b/opendj3/opendj-testng-support/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from opendj3/opendj-build-tools/opendj-testng-support/.settings/org.eclipse.jdt.core.prefs
rename to opendj3/opendj-testng-support/.settings/org.eclipse.jdt.core.prefs
diff --git a/opendj3/opendj-build-tools/opendj-testng-support/.settings/org.maven.ide.eclipse.prefs b/opendj3/opendj-testng-support/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from opendj3/opendj-build-tools/opendj-testng-support/.settings/org.maven.ide.eclipse.prefs
rename to opendj3/opendj-testng-support/.settings/org.maven.ide.eclipse.prefs
diff --git a/opendj3/opendj-build-tools/opendj-testng-support/pom.xml b/opendj3/opendj-testng-support/pom.xml
similarity index 97%
rename from opendj3/opendj-build-tools/opendj-testng-support/pom.xml
rename to opendj3/opendj-testng-support/pom.xml
index 5b77834..4486cbd 100644
--- a/opendj3/opendj-build-tools/opendj-testng-support/pom.xml
+++ b/opendj3/opendj-testng-support/pom.xml
@@ -30,7 +30,7 @@
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>opendj-build-tools</artifactId>
+ <artifactId>opendj-project</artifactId>
<groupId>org.opendj</groupId>
<version>3.0-SNAPSHOT</version>
</parent>
diff --git a/opendj3/opendj-build-tools/opendj-testng-support/src/main/java/org/opendj/buildtools/testng/OpenDJTestCase.java b/opendj3/opendj-testng-support/src/main/java/org/opendj/buildtools/testng/OpenDJTestCase.java
similarity index 100%
rename from opendj3/opendj-build-tools/opendj-testng-support/src/main/java/org/opendj/buildtools/testng/OpenDJTestCase.java
rename to opendj3/opendj-testng-support/src/main/java/org/opendj/buildtools/testng/OpenDJTestCase.java
diff --git a/opendj3/opendj-build-tools/opendj-testng-support/src/main/java/org/opendj/buildtools/testng/OpenDJTestListener.java b/opendj3/opendj-testng-support/src/main/java/org/opendj/buildtools/testng/OpenDJTestListener.java
similarity index 100%
rename from opendj3/opendj-build-tools/opendj-testng-support/src/main/java/org/opendj/buildtools/testng/OpenDJTestListener.java
rename to opendj3/opendj-testng-support/src/main/java/org/opendj/buildtools/testng/OpenDJTestListener.java
diff --git a/opendj3/opendj-build-tools/opendj-testng-support/src/main/java/org/opendj/buildtools/testng/package-info.java b/opendj3/opendj-testng-support/src/main/java/org/opendj/buildtools/testng/package-info.java
similarity index 100%
rename from opendj3/opendj-build-tools/opendj-testng-support/src/main/java/org/opendj/buildtools/testng/package-info.java
rename to opendj3/opendj-testng-support/src/main/java/org/opendj/buildtools/testng/package-info.java
diff --git a/opendj3/pom.xml b/opendj3/pom.xml
index 555b89d..5ef987b 100644
--- a/opendj3/pom.xml
+++ b/opendj3/pom.xml
@@ -28,13 +28,20 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.forgerock</groupId>
+ <artifactId>forgerock-parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
<groupId>org.opendj</groupId>
<artifactId>opendj-project</artifactId>
<version>3.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>OpenDJ Project</name>
<description>
- OpenDJ is a new LDAPv3 compliant directory service, developed for the Java platform, providing a high performance, highly available and secure store for the identities managed by enterprises.
+ OpenDJ is a new LDAPv3 compliant directory service, developed for the Java
+ platform, providing a high performance, highly available and secure store
+ for the identities managed by enterprises.
</description>
<url>http://www.opendj.org/</url>
<issueManagement>
@@ -53,28 +60,17 @@
<post>opendj-dev@forgerock.org</post>
</mailingList>
</mailingLists>
- <licenses>
- <license>
- <name>CDDL</name>
- <url>http://www.opensource.org/licenses/cddl1.php</url>
- </license>
- </licenses>
<scm>
<url>https://svn.forgerock.org/opendj/trunk/opendj3/</url>
<connection>scm:svn:https://svn.forgerock.org/opendj/trunk/opendj3/</connection>
<developerConnection>scm:svn:https://svn.forgerock.org/opendj/trunk/opendj3/</developerConnection>
<tag>HEAD</tag>
</scm>
- <organization>
- <name>ForgeRock</name>
- <url>http://www.forgerock.com/</url>
- </organization>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
<modules>
- <module>opendj-build-tools</module>
- <module>opendj-modules</module>
+ <module>opendj-testng-support</module>
+ <module>opendj-maven-plugin</module>
+ <module>opendj-sdk</module>
+ <module>opendj-client-tools</module>
</modules>
<build>
<plugins>
@@ -95,13 +91,32 @@
<name>Java.net Maven 2 Repository for GlassFish</name>
<url>http://download.java.net/maven/glassfish/</url>
</repository>
+ <repository>
+ <id>ForgeRock</id>
+ <name>ForgeRock Repository</name>
+ <url>http://repo.forgerock.org</url>
+ </repository>
</repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>ForgeRock-Plugin</id>
+ <name>ForgeRock Plugin Repository</name>
+ <url>http://repo.forgerock.org</url>
+ </pluginRepository>
+ </pluginRepositories>
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>org.easytesting</groupId>
+ <artifactId>fest-assert</artifactId>
+ <version>1.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>5.14.2</version>
+ <version>6.0.1</version>
+ <scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
--
Gitblit v1.10.0