From 407bb81fb935e713a4a1ae1b9189b81488a944d5 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Thu, 12 Feb 2015 11:29:32 +0000
Subject: [PATCH] OPENDJ-1777 Move several src directories to src/main/java

---
 opendj-server-legacy/src/main/java/org/opends/server/schema/DITContentRuleSyntax.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/AddOperationBasis.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Index.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardObjectClassPanel.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/Installation.java                                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseIndexPanel.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/MultifileTextWriter.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/DirectoryException.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/util/ServerController.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskEntry.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ReplicationDraftCNKey.java             |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/images/help_small.gif                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ClickTooltipDisplayer.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/ConnectionHandler.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskScheduleInformation.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/AccessLogPublisher.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteIndexTask.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/offline/OfflineInstaller.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/package-info.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/SubtreeSpecification.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallProgressStep.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/SambaPasswordPlugin.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/event/ProgressUpdateListener.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPFilter.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionProtocolPolicy.java                 |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BackupDescriptor.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPInputStream.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/DataServerHandler.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/AddResponseProtocolOp.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/SizePropertyDefinition.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackupPanel.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/BoundedWorkQueueStrategy.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVIndexTableModel.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObject.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/DeleteContext.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/UpdateToReplay.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/DictionaryPasswordValidator.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BackupCreatedEvent.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/RootNode.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/NullKeyManagerProvider.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/MD5PasswordStorageScheme.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateExactAssertionSyntax.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplInputStream.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/client/OperationRejectedException.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/ConsoleDebugLogPublisher.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationConnector.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java                                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/ReplicationDomainDB.java              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskScheduleInteraction.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BinaryAttributeEditorPanel.java                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/PendingChanges.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactEqualityMatchingRuleFactory.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPAuthenticationHandler.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DataConfig.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagementContext.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/CompareResponseProtocolOp.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeModifyOperation.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LoginPanel.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/BindOperation.java                                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationModifyOperation.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/controls/PagedResultsControl.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/ui/ConfirmUninstallPanel.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPMessage.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/controls/SubtreeDeleteControl.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskThread.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/CommonSchemaElements.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/images/info_small.gif                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/SecurityOptions.java                                               |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/CustomObjectClassTreeNode.java                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/package-info.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/BackupTaskListener.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/Task.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2Entry.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/package-info.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/client/AuthenticationException.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPModifyOptions.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/SuffixesToReplicateOptions.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/FileChangelogDB.java                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/DiskSpaceMonitor.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/asn1/package-info.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ScheduleType.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternRDN.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/package-info.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/LockManager.java                                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/TrustManagerProviderConfigManager.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/HeartbeatThread.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/asn1/GSERParser.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/webstart/WebStartInstaller.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/AttributeParser.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/plugin/PluginType.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/package-info.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/DataReplicationPanel.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationAddOperation.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Importer.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/BackendConfigManager.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/DNTag.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/ScheduleSummaryPanel.java                 |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/util/UIKeyStore.java                                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyProvider.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/CryptoManager.java                                               |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/util/BackgroundTaskThread.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationWrapper.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/EntryCache.java                                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordEqualityMatchingRuleFactory.java                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/AttributeIndex.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionUtils.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/AcceptRejectWarn.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/CertificateMapperConfigManager.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/BitStringEqualityMatchingRuleFactory.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/ExactMatchIdentityMapper.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/controls/MatchedValuesControl.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/client/ManagementContext.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ModifyCommonMsg.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciEvalContext.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/AggregationPropertyDefinition.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/Branch.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tasks/EnterLockdownModeTask.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/AuthenticationType.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/IdentityMapper.java                                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyOption.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationModifyDNOperation.java              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRuleFactory.java   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/EnableReplicationUserData.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/VirtualAttributeProvider.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tasks/ExportTask.java                                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/Action.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTask.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalSearchOperation.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeSearcherQueue.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/UnsavedChangesDialog.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/ObjectClassCellPanel.java                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/BlockLogReader.java                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/package-info.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectIdentifierEqualityMatchingRuleFactory.java                |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/clear-filter.png                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/IndexModifiedEvent.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/StringPropertyDefinition.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/TextErrorLogPublisher.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/RoutableMsg.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/util/LDIFReader.java                                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/FilteredStaticGroupMemberList.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/RelativeInheritedDefaultBehaviorProvider.java                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryID.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/NumSubordinateHacker.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/UniqueAttributePlugin.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/AlertHandlerConfigManager.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateListSyntax.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordExpiringControl.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/EntryEncodeConfig.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/DisableReplicationUserData.java                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/config/StringConfigAttribute.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/DN2ID.java                                                |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-vlv-idx.png                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java                                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/monitors/SystemInfoMonitorProvider.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/admin/ads/util/PreferredConnection.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/AbstractManagedObjectDefinition.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewAttributePanel.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/VerifyConfig.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/ServerHandler.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/border/AccordionElementBorder.java                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/SortValues.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/StopDS.java                                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/FixedTimeRotationPolicy.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxConnectionHandler.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultDoneProtocolOp.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseSearchOperation.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyWarningType.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/SelectAliasDialog.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFDiff.java                                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseCompareOperation.java                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/TelephoneNumberSubstringMatchingRuleFactory.java                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseExtendedOperation.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TimeOfDay.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRuleFactory.java                   |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerDescriptor.java              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/controls/SubentriesControl.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/InitializeRequestMsg.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRotationPolicy.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/PresentationAddressEqualityMatchingRuleFactory.java             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/LDIFExportConfig.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/util/cli/PointAdder.java                                               |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/package-info.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/rightarrow.png                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBackendPanel.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPRequestHandler.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/admin/ads/util/TrustedSocketFactory.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/AbstractManagedObject.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/LDAPManagedObject.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PluginOperation.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/SSLClientAuthPolicy.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicyFactory.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/FileReplicaDBCursor.java             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/AccessControlConfigManager.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/LDAPUpdateMsg.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumBindRuleType.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadResponseControl.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/KeyManagerProviderConfigManager.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/PasswordStorageScheme.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/common/package-info.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/SuffixContainer.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/Constraint.java                                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/client/AuthenticationNotSupportedException.java                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/RootContainer.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/ParallelWorkerThread.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRetentionPolicy.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ModifyContext.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/DefinitionResolver.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargAttrFilterList.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ErrorSearchingEntryPanel.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/NullIndex.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPAuthenticationConfig.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewGroupPanel.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugLogger.java                                               |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/images/warning_small.gif                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DatabaseEnvironmentMonitor.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/controls/AccountUsableResponseControl.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleFactory.java  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/CanceledOperationException.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/MemberList.java                                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/DistinguishedNameEqualityMatchingRuleFactory.java               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/LogFileFilter.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ReplicationMsg.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/Credential.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/WindowProbeMsg.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/State.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyResponseProtocolOp.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackupManager.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/StartMsg.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/AbstractIndexTableModel.java                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/LogRetentionPolicyConfigManager.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/UserDataException.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServer.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskState.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/task/FailedDependencyAction.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BinaryValue.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/StepsPanel.java                                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/AddRequestProtocolOp.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/PurgeHistoricalScheduleInformation.java            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/AccountStatusNotificationType.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAccessLogPublisher.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/TimeBasedMatchingRuleFactory.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/client/AdminClientException.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/util/CertificateManager.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/SequentialTag.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ResetGenerationIdMsg.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistoricalAttributeValue.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/images/info_large.gif                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/JDKLoggingFormater.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2URI.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectClassSyntax.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/util/ExtensionFileFilter.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/ClassPropertyDefinition.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/ExtensionsConstants.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/common/AssuredMode.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/DomainDBCursor.java                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexQueryFactoryImpl.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreOrderingMatchingRuleFactory.java                      |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/LDAPEntryReader.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/ConnectionHandlerConfigManager.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObjectDeleteListenerAdaptor.java             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/PostExternalInitializationUserData.java            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tasks/ImportTask.java                                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/client/ClientConstraintHandler.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugStackTraceFormatter.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/plugin/InternalDirectoryServerPlugin.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/LowerCaseComparator.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/WriteableStorage.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/ActionButton.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRuleFactory.java           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/EntryWriter.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tasks/ShutdownTask.java                                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/controls/AccountUsableRequestControl.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/SortableListModel.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadRequestControl.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/SASLConfigManager.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/LogPublisherErrorHandler.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/StabilityLevel.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/PublicAPI.java                                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/GeneralMonitoringTreeNode.java                 |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/AuthenticationData.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciBody.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumAccessType.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/HTTPAccessLogPublisher.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/SortOrder.java                                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPStatistics.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/AccessControlHandler.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplayThread.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java                                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/package-info.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetupDialog.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/package-info.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tasks/DisconnectClientTask.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/OperationContext.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/UUIDSyntax.java                                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/LDAPEntryTableCellRenderer.java             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryIDSetSorter.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/package-info.java                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/util/SelectableCertificateKeyManager.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallData.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/BackendInitializationListener.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserDNTypeURL.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/TelexNumberSyntax.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDBCursor.java       |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/AccessibleTableHeaderRenderer.java          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/DITCacheMap.java                                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/status/package-info.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/AttributeValuePasswordValidator.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeLog.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/RestoreDB.java                                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/UserAttributeNotificationMessageTemplateElement.java        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedTrustManagerProvider.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/util/RuntimeInformation.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/EntryCachesMonitoringPanel.java                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/MembershipException.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/DatabaseContainer.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationDeleteOperation.java                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Suffix.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ReplicaOfflineMsg.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ModifyDNMsg.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationExtendedOperation.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/QueueingStrategy.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/JDKLogging.java                                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/util/ExpirationCheckTrustManager.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/SelectableLabelWithHelpIcon.java          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java              |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ControlPanelInfo.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/Tag.java                                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationAddOperation.java                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/FileReplicaDB.java                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/package-info.java                                               |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallerHelper.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/NullOutputStream.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/BlockLogWriter.java                  |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/CategorizedComboBoxElement.java               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/UniqueMemberEqualityMatchingRuleFactory.java                    |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/images/info_medium.gif                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/images/wait_tiny.png                                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/CompressedSchema.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/controls/PersistentSearchControl.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/ClearPasswordStorageScheme.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/GuideSyntax.java                                                |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringOrderingMatchingRuleFactory.java                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/task/package-info.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/package-info.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/OperationConfig.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/BackupInfo.java                                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/RestoreConfig.java                                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/IntermediateResponse.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/required.gif                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/AciSyntax.java                                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargetFilter.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationModifyOperation.java                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/config/ReadOnlyConfigAttribute.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/ReplicaId.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/CertificateValidationPolicy.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/WhoAmIExtendedOperation.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ProgressUpdateListenerDelegate.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/ModifyOperationBasis.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MainMenuBar.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/AddOperationWrapper.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/ExternalSASLMechanismHandler.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tasks/TaskUtils.java                                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/BindOperationBasis.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/Sha2Crypt.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/admin/ads/ReplicaDescriptor.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/package-info.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDBCursor.java   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryIDSet.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/OperationType.java                                               |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/TreePanel.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/PersistentSearch.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/package-info.java                                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreListEqualityMatchingRuleFactory.java                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/AsynchronousTextWriter.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplLDIFOutputStream.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/webstart/WebStartDownloader.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/PostalAddressSyntax.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigAddListenerAdaptor.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfileStack.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-idx-folder.png                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/ConfigDeleteListener.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/util/DeleteChangeRecordEntry.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/GZIPAction.java                                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/monitors/MemoryUsageMonitorProvider.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/package-info.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryID.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/controls/ControlDecoder.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/TimeLimitRotationPolicy.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/VirtualStaticGroup.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/client/CommunicationException.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntrySelectionPanel.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/AccountStatusNotificationHandler.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/DITContentRule.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Target.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/IfPresentTag.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/LDAPConnectionPool.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/Application.java                                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationDomainMonitor.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRuleFactory.java       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/ModifyOperationWrapper.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/Schema.java                                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ChangeNumberIndexer.java               |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeRefresher.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/JMXAlertHandler.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/LockType.java                                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/ParallelWorkQueue.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/DN.java                                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/TraceSettings.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/border/package-info.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/CustomAttributeTreeNode.java                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/MonitorProvider.java                                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/SetRelationDefinition.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordModifyExtendedOperation.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/IndexType.java                                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV2Control.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/ServerShutdownMonitor.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/InvokableMethod.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/IdentifiedException.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPDeleteOptions.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/util/CollectionUtils.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexBuffer.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/ConfigurationObjectClassTreeNode.java          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/monitors/ClientConnectionMonitorProvider.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/Step.java                                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/NullIndex.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/AlertGenerator.java                                                |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/package-info.java                                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/DirectoryThread.java                                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/PasswordGenerator.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/NullTrustManagerProvider.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/BindRequestProtocolOp.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/images/opendjbackground.png                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/VirtualAttributeConfigManager.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java             |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BackendPopulatedListener.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/StaticTextTag.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/UserDataConfirmationException.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/util/Crypt.java                                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/util/OutputReader.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/ConfigHandler.java                                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/EncryptAction.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConnectionHandlerMonitoringPanel.java                |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactOrderingMatchingRuleFactory.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewIndexPanel.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/monitors/StackTraceMonitorProvider.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ScrollPaneBorderListener.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseAddOperation.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/service/package-info.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/SignatureAction.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/EntryReadListener.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallWelcomePanel.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-rule-folder.png                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/HeartbeatMsg.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyDNResponseProtocolOp.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/NewSuffixOptions.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/InvokableComponent.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/event/ButtonEvent.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaBrowserRightPanel.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeOperationComparator.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistAttrModificationKey.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/ConnectionSecurityProvider.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/ClientConnection.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationBindOperation.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/RestoreTaskListener.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/util/EmbeddedUtils.java                                                |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ComboKeySelectionManager.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerConstraintHandler.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/PresenceIndexer.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SoftReferenceEntryCache.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ImportLDIFReader.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DbPreloadComparator.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/SearchOperationWrapper.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserDN.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/TaskScheduleArgs.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TagResult.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/package-info.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/UserDataCertificateException.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/CompareOperation.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/TopologyMsg.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/RebuildIndex.java                                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/monitors/package-info.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/util/VersionCompatibilityIssue.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumEvalResult.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugLogPublisher.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/DraftCNDB.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/DeleteOperationWrapper.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/UserData.java                                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/config/MultiChoiceConfigAttribute.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/BaseDnRegistry.java                                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/RawAttribute.java                                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/SubEntry.java                                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyState.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/TextWriter.java                                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/SortKey.java                                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/PasswordStorageSchemeConfigManager.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/SubtreeSpecificationSyntax.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/controls/MatchedValuesFilter.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-user.png                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tasks/SetGenerationIdTask.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/images/divider-left.png                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/AbstractIndexTreeNode.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/WizardStep.java                                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/server/DNBuilder.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplOutputStream.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/WaitForFileDelete.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangelogNotificationControl.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/AddOperation.java                                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/AuthenticatedUsers.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanel.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/RotationActionThread.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/package-info.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/SevenBitCleanPlugin.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/BasicExpander.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/CollectiveAttributeSubentriesVirtualAttributeProvider.java  |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/BasicNodeError.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/ExportTaskListener.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/RawModification.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/ProgressDialog.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/AbstractPasswordEqualityMatchingRuleImpl.java                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/GUIDTag.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DatabaseContainer.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/CoreConfigManager.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/controls/AuthorizationIdentityResponseControl.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeUtils.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/AnonymousSASLMechanismHandler.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/util/LDIFWriter.java                                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/util/StandardOutputSuppressor.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationBindOperation.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractIndexPanel.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperation.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/QuickSetupLog.java                                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/StartSessionMsg.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/NoLeftInsetCategoryComboBoxRenderer.java    |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/CategoryTreeNode.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PermBindRulePair.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/MatchingRuleSyntax.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/StorageRuntimeException.java                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangeNotificationControl.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/AbandonOperation.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/ProgressPanel.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumUserDNType.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaUpdater.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/UTCTimeSyntax.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-syntax.png                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/images/divider-right.png                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeModdnOperation.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ModifyDnContext.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StopServerTask.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/PreExternalInitializationUserData.java             |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/SchemaElementSelectionListener.java               |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-idx.png                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumAuthMethod.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyErrorType.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfigurationAttributePanel.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/CancelRequest.java                                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/MakeLDIFException.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/IconPool.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlersMonitoringTableModel.java   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/TraditionalWorkerThread.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/plugin/DirectoryServerPlugin.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliParser.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/ThreadFilterTextErrorLogPublisher.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RootMonitoringPanel.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/AbandonOperationBasis.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObjectDeleteListener.java                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/EntityTagVirtualAttributeProvider.java                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2ID.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/Session.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/FilterType.java                                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/LDAPManagementContext.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/client/package-info.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackendVLVIndexesPanel.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/KeyManagerProvider.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskScheduler.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationSearchOperation.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/PresenceIndexer.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationDeleteOperation.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryCachePreloader.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexInputBuffer.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/IndexTreeNode.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumEvalReason.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortResponseControl.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/event/ProgressNotifier.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/package-info.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/ImportTaskListener.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/OperationsException.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/SubentryChangeListener.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/FormattedNotificationCallback.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CustomTree.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VLVIndex.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRuleFactory.java                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/RelationDefinitionVisitor.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ID2Entry.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BrowserEventListener.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tasks/AddSchemaFileTask.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/OfflineUpdateException.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/ReviewPanel.java                                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyFactory.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/CustomHTMLEditorKit.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/IndexBrowserRightPanel.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/DBCursor.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/IndexPanel.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/TitlePanel.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateLine.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/DndBrowserNodes.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SMTPAlertHandler.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/images/error_small.gif                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFSearch.java                                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigurationAddListener.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskBackend.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/CreateRCScript.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/BackendImpl.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/KeywordEqualityMatchingRuleFactory.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/ExportLDIF.java                                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/WorkQueueConfigManager.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ECLEnabledDomainPredicate.java         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPConnectionOptions.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/plugin/package-info.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/DNS.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/offline/package-info.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/ParentDNTag.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SimpleStaticGroupMemberList.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerConnectThread.java                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseAbandonOperation.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/package-info.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/EntryReadErrorEvent.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/GuiApplication.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/FileNumberRetentionPolicy.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BackendPopulatedEvent.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/Status.java                                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringEqualityMatchingRuleFactory.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryContainer.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/ObjectClass.java                                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVIndexDescriptor.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/BooleanPropertyDefinition.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java                |    0 
 opendj-server-legacy/src/main/java/org/opends/admin/ads/SubtreeDeleteControl.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/UnbindOperationBasis.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/Group.java                                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/LicenseFile.java                                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationSearchOperation.java                      |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/SecurityOptionsDialog.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MainActionsPane.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/FilePermission.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/AttributeSyntaxConfigManager.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/CannotRenameException.java                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationDomainMonitorData.java                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/util/SizeLimitInputStream.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewSchemaElementsTask.java                         |    0 
 opendj-server-legacy/pom.xml                                                                                                |    4 ----
 opendj-server-legacy/src/main/java/org/opends/server/util/Platform.java                                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tasks/InitializeTargetTask.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationCompareOperation.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/condition/IsPresentCondition.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/LockFileManager.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackupListPanel.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsRMIJRMPServerImpl.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/LDIFConnectionHandler.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java          |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/images/help_large.gif                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroupSearchThread.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/TLSCapableConnection.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/FileManager.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java        |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TaskToSchedulePanel.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2CIndexer.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPConnectionHandler.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/EntryReadEvent.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/RelationDefinition.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/ServerShutdownListener.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseAddOperation.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/FinishedPanel.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/FileNamingPolicy.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/IndexSelectionListener.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/SchemaConfigManager.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2SIndexer.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordExpiredControl.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPPasswordModify.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/BackupDirectory.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/package-info.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPToolOptions.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumRight.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/StaticGroup.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContextHelper.java                                               |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StartServerTask.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/ServerWriter.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/SSLConnectionException.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/images/error.gif                                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackendIndexesPanel.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/LastCookieVirtualProvider.java                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPConnectionException.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyValueVisitor.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/SuperiorObjectClassesEditor.java          |    0 
 opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ApplicationKeyManager.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/images/opendjsplash.png                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ConfigurableEnvironment.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/BackupConfig.java                                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/RedirectingByteChannel.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/OnlineUpdateException.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/LDIFImportConfig.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/SearchOperationBasis.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericFrame.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/PluginConfigManager.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/EntryHistorical.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/AttributeTypePropertyDefinition.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryCachePreloader.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/ZIPAction.java                                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDB.java         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/JavaPropertiesToolArgumentParser.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-class-folder.png                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsJmxConnector.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/VirtualAttribute.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/ui/package-info.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ImportIDSet.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/BuildInformation.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectOption.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/JECompressedSchema.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS5S2PasswordStorageScheme.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VerifyIndexPanel.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreEqualityMatchingRuleFactory.java                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/SynchronizationProviderResult.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/field-locked.png                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfilerPlugin.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPModification.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/AttributeIndex.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigReader.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/BackendToolUtils.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BasicMonitoringAttributes.java                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/task/Task.java                                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/CharacterSetPasswordValidator.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/images/warning.gif                                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-vlv-idx-folder.png                            |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ReferralAuthenticationListener.java               |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ProgressDescriptor.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/UnbindOperationWrapper.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationPropertyNotificationMessageTemplateElement.java |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/RebuildConfig.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/WorkQueueStrategy.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/SearchFilter.java                                                |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConfigReadException.java                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/GroupDN.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/RecordingOutputStream.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/ErrorLogger.java                                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/TelephoneNumberSyntax.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAuditLogPublisher.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/SearchAbandonException.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexQuery.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ReadOnlyConfigFileHandler.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskTool.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/StandardObjectClassTreeNode.java               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/util/args/package-info.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/NumericLimitedSizeDocumentFilter.java     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV1Control.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/IPAddressPropertyDefinition.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanelLauncher.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JebException.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreListSubstringMatchingRuleFactory.java                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/Control.java                                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordPolicyStateExtendedOperation.java                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/KeywordBindRule.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/event/ProgressUpdateEvent.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/common/CSN.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/MoveEvent.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/SubentryManager.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/InitializeReplicationUserData.java                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/RDN.java                                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/SelectableTableCellRenderer.java            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/Privilege.java                                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/TextHTTPAccessLogPublisher.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/package-info.java                                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObjectAddListenerAdaptor.java                |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/LabelWithHelpIcon.java                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/OptionalRelationDefinition.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationAbandonOperation.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseExtendedOperation.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/package-info.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyObjectClassTask.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/ChangeNumberControlPlugin.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/DeleteOperationBasis.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/AuthPasswordEqualityMatchingRuleFactory.java                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/RecordingInputStream.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FractionalLDIFImportPlugin.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/InitializeRcvAckMsg.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/UpdateMsg.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/event/package-info.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/GlobalAdministratorPanel.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/BackupManager.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/ParentInheritance.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPDelete.java                                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/http/package-info.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/monitors/DatabaseEnvironmentMonitor.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/VLVIndexTreeNode.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreSubstringMatchingRuleFactory.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/TrustStoreBackend.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/DbPreloadComparator.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/OperationWrapper.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/package-info.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseModifyOperation.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/config/BooleanConfigAttribute.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/DoubleAddRemovePanel.java                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearchOptions.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ColorAndFontConstants.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPAssertionRequestControl.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tasks/BackupTask.java                                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/RandomTag.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/ui/LoginDialog.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/webstart/package-info.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ImportLDIFReader.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SASLByteChannel.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/LastNameTag.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliException.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/GetConnectionIDExtendedOperation.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/ConfigAddListener.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/RebuildIndexTask.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/Configuration.java                                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerSyntax.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseOperation.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java         |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AddToGroupPanel.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/ConfigurationHandler.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/HTTPAccessLogger.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/asn1/GSERException.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/SSF.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/IndexComboBoxCellRenderer.java              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/BooleanSyntax.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/DirectoryStringSyntax.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/DataOptionsPanel.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-group.png                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/NotAssuredUpdateMsg.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/TripleDESPasswordStorageScheme.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPModify.java                                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/Attributes.java                                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/CollectiveVirtualAttribute.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ReturnCode.java                                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/service/CTHeartbeatPublisherThread.java                    |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/SuperiorObjectClassesChangedEvent.java            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConstraintViolationException.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/FramePanel.java                                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/DefaultCompressedSchema.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/DirectoryEnvironmentConfig.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/CustomListCellRenderer.java                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/BlowfishPasswordStorageScheme.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexInputBuffer.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultReferenceProtocolOp.java                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/LDAPProfile.java                                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-referral.png                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/CountryStringSyntax.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/AttributeTypeSyntax.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/SearchResultEntry.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigExceptionFactory.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/AdminException.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationOperation.java                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/UnbindOperation.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/TextNotificationMessageTemplateElement.java                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/FaxSyntax.java                                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/BitStringSyntax.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/VLVSortOrderRenderer.java                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalSingle.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tasks/LeaveLockdownModeTask.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/package-info.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/BooleanEqualityMatchingRuleFactory.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/SubordinateModifyDNOperation.java                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseSearchOperation.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/InstantiableRelationDefinition.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/FirstNameTag.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/SuffixesToReplicatePanel.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/util/SetupUtils.java                                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java                                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/DeleteOperation.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/ServerContext.java                                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRuleFactory.java              |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Permission.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/package-info.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-suffix.png                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/SmallMap.java                                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/GeneralizedTimeSyntax.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigurationChangeListener.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/IPAddressMaskPropertyDefinition.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/AttributeSyntaxTreeNode.java                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/BlindTrustManagerProvider.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaConstants.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/package-info.java                                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/LDAPDriver.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplicationServerListener.java                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringSyntax.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/FIFOEntryCache.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/Base64PasswordStorageScheme.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/CertificateMapper.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/package-info.java                                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-ou.png                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/WebBrowserErrorDialog.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternIP.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/DefaultManagedObject.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/SubentryPasswordPolicy.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Installation.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/Record.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEUtils.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactSubstringMatchingRuleFactory.java                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java                                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tasks/RestartTaskThread.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/ManageTasks.java                                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/ServerReader.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/CliUserInteraction.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Suffix.java                                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VerifyJob.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationTypeNotificationMessageTemplateElement.java     |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GeneralMonitoringRightPanel.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalMultiple.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/util/args/LDAPConnectionArgumentParser.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/CliApplication.java                                                |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/WindowsServicePanel.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/DirectoryConfig.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/CancelResult.java                                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VLVKeyComparator.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/package-info.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/DeliveryMethodSyntax.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/RelationOption.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadRequestControl.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/PrintableStringSyntax.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/StopWindowsService.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/MatchingRuleFactory.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/TelephoneNumberEqualityMatchingRuleFactory.java                 |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/package-info.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyResponseControl.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tasks/package-info.java                                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tasks/PurgeConflictsHistoricalTask.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ReplSessionSecurity.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyDefinitionUsageBuilder.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/IntermediateResponseProtocolOp.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPStatsProbe.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VerifyJob.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationUserData.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/util/URLWorker.java                                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/AbstractOperation.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/ProtocolElement.java                                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEReplicaDBCursor.java                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/LoggingCategoryNames.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/JNDIDirContextAdaptor.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/LDIFBackend.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/CertificatePairSyntax.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/common/StatusMachineEvent.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/service/HeartbeatMonitor.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigurationDeleteListener.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/AliasDefaultBehaviorProvider.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/RemotePendingChanges.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryIDSet.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/MonitorRequestMsg.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargets.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/LastModPlugin.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/MultimasterReplication.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/DefaultBehaviorProvider.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciException.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/LastChangeNumberVirtualAttributeProvider.java       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java          |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MatchingRulePanel.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObjectAddListener.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/common/CSNGenerator.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/admin/ads/TopologyCache.java                                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/FingerprintCertificateMapper.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericDialog.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/images/package-info.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyAttributeTask.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordSyntax.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/config/IntegerConfigAttribute.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/client/ManagedObject.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/SortValues.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseDeleteOperation.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallLicensePanel.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/MakeLDIFInputStream.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/AttributeBuilder.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/admin/ads/SuffixDescriptor.java                                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/SynchronizationProviderConfigManager.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IDSetIterator.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericMenuBar.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/ClassLoaderProvider.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/WordEqualityMatchingRuleFactory.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/persistit/package-info.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationUnbindOperation.java                      |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CellEditorButton.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/ChangeNumberIndexRecord.java          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/SingletonRelationDefinition.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/status/StatusCli.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/ExistingFileBehavior.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ExportJob.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/util/ModifyDNChangeRecordEntry.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/CollationMatchingRuleFactory.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/admin/ads/util/OpendsCertificateException.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/ExpectedAcksInfo.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/ChangeNumberIndexDB.java              |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/SortableTableModel.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/PendingChange.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalSearchListener.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/AbandonRequestProtocolOp.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/util/package-info.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java                                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/controls/VLVRequestControl.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplicationRepairRequestControl.java                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/AbandonOperationWrapper.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/DayOfWeek.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyNotFoundException.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/server/DelayedConfigAddListener.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationAddOperation.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPOutputStream.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-attr.png                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/Importer.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/MatchingRuleUseSyntax.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BaseDNPanel.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/crypto/GetSymmetricKeyExtendedOperation.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/NamedCharacterSet.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AttributeSyntaxPanel.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/DefinedDefaultBehaviorProvider.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/condition/ORCondition.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumTargetOperator.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/AddContext.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EnvManager.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ModifyMsg.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/ProtocolInformationEqualityMatchingRuleFactory.java             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/CoreConstants.java                                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ExtendedResponseProtocolOp.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/SearchResultReference.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/SchemaElementTreeNode.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/BinarySyntax.java                                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProvider.java         |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/MoveListener.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/PostRotationAction.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/package-info.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/config/ConfigEntry.java                                                |    0 
 opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java                                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexOutputBuffer.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringSyntax.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/util/HtmlProgressMessageFormatter.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/UndefinedDefaultBehaviorProvider.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationMonitor.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/package-info.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/State.java                                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/DirectoryServerMBean.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/ModifyDNOperation.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/ModifyDNOperationWrapper.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java                  |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ConfigChangeListener.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPResultCode.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/downarrow.png                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseModifyDNOperation.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/ProgressNotificationCallback.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/PasswordValidatorConfigManager.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationConfigManager.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/ConfigurationBootstrapper.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BinaryValuePanel.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EqualityIndexer.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/NotSupportedOldVersionPDUException.java           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/util/BSDMD5Crypt.java                                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/LDAPNameBuilder.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/RootDNConfigManager.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciList.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/DoneMsg.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexFilter.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ExportJob.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/StartTLSExtendedOperation.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ProgressDialog.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/SchemaLoader.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/LabelFieldDescriptor.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Indexer.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/DeleteRequestProtocolOp.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BackendDescriptor.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/OpenDsException.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxClientConnection.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/EntryMsg.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/http/SdkConnectionAdapter.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/FileTag.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallUserData.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationExtendedOperation.java                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargetAttr.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tasks/ShutdownTaskThread.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallLauncher.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Aci.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/controls/GetEffectiveRightsRequestControl.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalMozillaLDAPSocketFactory.java               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/VirtualAttributeRule.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/DefaultEntryCache.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/util/package-info.java                                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateFile.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/RetentionPolicy.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationalUnitPanel.java                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/CompareOperationWrapper.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeOperation.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractBackendIndexesPanel.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectDefinition.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/SearchEntrySearchOperation.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/admin/ads/TopologyCacheFilter.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/images/currentstep.gif                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumDayOfWeek.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/IP.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/MessageHandler.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/BackUpDB.java                                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ControlCenterMainPane.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/Log.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringEqualityMatchingRuleFactory.java                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/UUIDOrderingMatchingRuleFactory.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectEqualsDNCertificateMapper.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectDefinitionI18NResource.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/WindowMsg.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RebuildIndexPanel.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/client/ManagedObjectDecodingException.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/ChangelogDB.java                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateSyntax.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEBUtils.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/BrowserNodeInfo.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/DBTest.java                                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/LogFile.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JebFormat.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/PasswordPolicyImportPlugin.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-folder.png                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEReplicaDB.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/DeleteMsg.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/package-info.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/LDAPEntryChangedListener.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-syntax-folder.png                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-rule.png                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/images/opendjminimizedmac.png                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/package-info.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringSubstringMatchingRuleFactory.java                  |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/Launcher.java                                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/LDAPSyntaxDescription.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/DistinguishedNameSyntax.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/UnderscoreParentDNTag.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ConfiguredDomain.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/images/warning_medium.gif                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/EntryUUIDPlugin.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/BindResponseProtocolOp.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/Requests.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/RotatableLogFile.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerTableModel.java              |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BackupTableCellRenderer.java                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedKeyManagerProvider.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciEffectiveRights.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallCliHelper.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/ChangelogException.java               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/EncodePassword.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/ConfigureWindowsService.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/common/MultiDomainServerState.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/IdleTimeLimitThread.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternDN.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/IA5StringSyntax.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/util/LevenshteinDistance.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/common/ServerStatus.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/http/CollectClientConnectionsFilter.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/package-info.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tasks/InitializeTask.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerSync.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeDelOperation.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/UniqueCharactersPasswordValidator.java                      |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/TaskTableModel.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/util/Base64.java                                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/ButtonsPanel.java                                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/ReadOperation.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/SchemaFileElement.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationModifyDNOperation.java                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/DITStructureRule.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/Utilities.java                                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ExtendedRequestProtocolOp.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/Constants.java                                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargAttrFilters.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalWithOptions.java                      |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/border/SelectedCategoryBorder.java                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/config/ConfigConstants.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConnectionHandler.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/AuthenticationInfo.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/AccessLogger.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractTextAccessLogPublisher.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/client/MissingMandatoryPropertiesException.java                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/config/ConfigException.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroup.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateEntry.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/UnderscoreDNTag.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BrowserEvent.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/TraditionalWorkQueue.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/PurgeHistoricalUserData.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/AddToGroupTask.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/package-info.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/Reference.java                                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/RegularExpressionIdentityMapper.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/FilterTextField.java                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/PlainSASLMechanismHandler.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/MonitoringPublisher.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/task/RecurringTask.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/Property.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroupMemberList.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/package-info.java                                               |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ButtonName.java                                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/DisconnectReason.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Index.java                                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/Attribute.java                                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaInformationMonitoringPanel.java                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/InProgressOperation.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/AuthPasswordExactEqualityMatchingRuleFactory.java               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/ExtOp.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/monitors/VersionMonitorProvider.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicyState.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractLogger.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GeneralMonitoringPanel.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ChangeTimeHeartbeatMsg.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/package-info.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ProcessReader.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/JavaPropertiesTool.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/TLSByteChannel.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeContext.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalConnectionHandler.java                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/PropertySet.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/Configuration.java                                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/SearchOperation.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/RecordParser.java                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationDomain.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/WriteOperation.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/ReferralLimitExceededException.java             |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/BasicNode.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/AbstractIndexDescriptor.java                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDSArgumentParser.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVSortOrder.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/UIFactory.java                                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/LogPublisher.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ExportLDIFPanel.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProvider.java                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StartStopTask.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/util/ZipExtractor.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseGeneralMonitoringPanel.java                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProvider.java                |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/Uninstaller.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordEqualityMatchingRule.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/PasswordValidator.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectPathSerializer.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/DecodingException.java               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/PresentationAddressSyntax.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/MemoryBackend.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/package-info.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/IndexTableModel.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/EnumPropertyDefinition.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RefreshOptionsPanel.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/SplashScreen.java                                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/ProtocolInformationSyntax.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/ConfigurationAttributeTreeNode.java            |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DBEnvironmentMonitoringPanel.java                    |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/IndexModifiedListener.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/client/ConcurrentModificationException.java                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortRequestControl.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/RemoteReplicationPortsPanel.java                      |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RestorePanel.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPClientConnection.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaProvider.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordExactEqualityMatchingRuleFactory.java               |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/util/ProgressMessageFormatter.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationModifyOperation.java                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/Storage.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-ppol.png                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/LocalPurgeHistorical.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfilerThread.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/util/ModifyChangeRecordEntry.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SASLContext.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ByteArrayScanner.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliReturnCode.java                      |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/AbstractNodeTask.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/DBEnvironmentMonitoringTableModel.java        |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/BackgroundTask.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MonitoringAttributesViewPanel.java                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObjectChangeListener.java                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/AttributeType.java                                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/AttributeCleanupPlugin.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ControlPanelLog.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/BindRule.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/SupportedAlgorithmSyntax.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringSubstringMatchingRuleFactory.java                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/TimeStampNaming.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-attr-folder.png                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Indexer.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/monitors/EntryCacheMonitorProvider.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/util/WebBrowserException.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/ServerSettingsPanel.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/config/IntegerWithUnitConfigAttribute.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/AccountStatusNotification.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/AddMsg.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/ReplicationEnvironment.java          |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-generic.png                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/LogRotationPolicyConfigManager.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerDomain.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/AttributeCellEditor.java                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/util/LDIFException.java                                                |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromFile.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ByteArrayBuilder.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargetMatchContext.java                    |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/AddRemovePanel.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/AuthPasswordSyntax.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistorical.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/UserInteraction.java                                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/condition/package-info.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/GSSAPISASLMechanismHandler.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/RotationPolicy.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigChangeListenerAdaptor.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/BlindApplicationTrustManager.java                  |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetupErrorPanel.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/condition/ANDCondition.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServerShutdownHook.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BaseDNCellRenderer.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/service/DSRSShutdownSync.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/ListBackends.java                                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/InitializeTargetMsg.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseCompareOperation.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/IndexCellRenderer.java                      |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewUserPanel.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanelArgumentParser.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/condition/NOTCondition.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/BinaryCellPanel.java                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPToolUtils.java                                               |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/images/help_medium.gif                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/BrowserController.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/package-info.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/package-info.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ConfigurationElementCreatedListener.java          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/LengthBasedPasswordValidator.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringOrderingMatchingRuleFactory.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObjectChangeListenerAdaptor.java             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/JebFormat.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciContainer.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/RmiConnector.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/CacheEntry.java                                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/AccountStatusNotificationProperty.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/DeleteResponseProtocolOp.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetupStepPanel.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/ParallelTextWriter.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRuleImpl.java          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/OIDSyntax.java                                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ProtocolOp.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/AckMsg.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/ChangelogBaseDNVirtualAttributeProvider.java        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/SchemaHandler.java                                                |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/util/PlainTextProgressMessageFormatter.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/SafeDataExpectedAcksInfo.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/StartWindowsService.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/monitors/BackendMonitor.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/AbstractAttribute.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/util/MultiOutputStream.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPControl.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/SortableTableModel.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/condition/ContainsCondition.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/controls/package-info.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyDefinitionVisitor.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicy.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ExternalChangelogDomain.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/client/AuthorizationException.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BrowseActionListener.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/ReadableStorage.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/SuperiorObjectClassesChangedListener.java         |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallProgressStep.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/doc/package-info.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/controls/PersistentSearchChangeType.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationOperation.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/admin/ads/util/BlindTrustManager.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/RuntimeOptionsPanel.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/images/error_medium.gif                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/ListTag.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/package-info.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/util/CompatibleJava.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyRequestControl.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProvider.java              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/controls/VLVResponseControl.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/StandardAttributeTreeNode.java                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/MonitorConfigManager.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeCli.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/SortValuesSet.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/DefaultAccessControlHandler.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/JPEGSyntax.java                                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/images/warning_large.gif                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ResetUserPasswordPanel.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/LDIFImportResult.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/RemoteSchemaLoader.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ConfiguredReplication.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskClientException.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewDomainPanel.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/util/IncompatibleVersionException.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ID2CIndexer.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/MatchingRuleUse.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/AttributeSyntax.java                                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearch.java                                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyDNRequestProtocolOp.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationBroker.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/common/StatusMachine.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPWriter.java                                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/FaxNumberSyntax.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/PeerNotFoundException.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPStatistics.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NoItemSelectedPanel.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/condition/Conditions.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/PersistentServerState.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/WorkQueueMonitoringPanel.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/UpdateFunction.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/EnhancedGuideSyntax.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/SynchronousStrategy.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/LightweightServerHandler.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/LogReaderPool.java                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseBindOperation.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerHandler.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ReplicationDB.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/IndexTask.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactIA5EqualityMatchingRuleFactory.java                    |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNTableModel.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CategoryButton.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumBooleanTypes.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/LDAPConnection.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/admin/ads/package-info.java                                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationPanel.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/IdentityMapperConfigManager.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/Driver.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/DraftCNData.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/MonitorMsg.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/NameFormSyntax.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContextException.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/StatusAnalyzer.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/LoggerConfigManager.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPReader.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigDeleteListenerAdaptor.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/ModifyDNOperationBasis.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/LDAPEntryChangedEvent.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/NameForm.java                                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerListenThread.java                  |    0 
 opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ApplicationTrustManager.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/package-info.java                                                |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/images/wait.gif                                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/LDAPADListPlugin.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/images/opendjminimized.gif                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/package-info.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexOutputBuffer.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/FileComparator.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/RepeatedCharactersPasswordValidator.java                    |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/JavaArguments.java                                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/monitors/TraditionalWorkQueueMonitor.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/LogWriter.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/util/EMailMessage.java                                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicy.java                                               |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/package-info.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/package-info.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/Modification.java                                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationMessageTemplateElement.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ChangeStatusMsg.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/RDNTag.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetupPanel.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/plugin/PluginResult.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/SearchReferenceSearchOperation.java                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SimilarityBasedPasswordValidator.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectPath.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseDeleteOperation.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SelectObjectClassesPanel.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/util/AddChangeRecordEntry.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexQueryFactoryImpl.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationDeleteOperation.java                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/HTTPRequestInfo.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalClientConnection.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BackupTableModel.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/common/DSInfo.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseModifyOperation.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/StopMsg.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/package-info.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/MultiDomainDBCursor.java               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/common/RSInfo.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/AbstractRequestImpl.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/ACIPropertyDefinition.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyRequestProtocolOp.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/PasswordGeneratorConfigManager.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/ConfigChangeListener.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/PromptTrustManager.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/TaskCellRenderer.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/PrintableString.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfileViewer.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/BindOperationWrapper.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ObjectClassValue.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/ActionType.java                                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFModify.java                                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDNNotificationMessageTemplateElement.java               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/SearchRequest.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactIA5SubstringMatchingRuleFactory.java                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/MakeLDIF.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPClientConnection.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrValueHistorical.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/clear-filter-down.png                            |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallReviewPanel.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugTracer.java                                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/DITStructureRuleSyntax.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/config/package-info.java                                               |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ApplicationPrintStream.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendCompareOperation.java         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/EntryCacheConfigManager.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/CurrentStepPanel.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ConfigurationChangeEvent.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerOrderingMatchingRuleFactory.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/util/BuildVersion.java                                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/config/JMXMBean.java                                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Importer.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/event/ButtonActionListener.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/util/ChangeOperationType.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargetControl.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ServerLoader.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ReplServerStartDSMsg.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPReader.java                                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciLDAPOperationContainer.java                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/CancelExtendedOperation.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EqualityIndexer.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadResponseControl.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/MonitoringAttributes.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ViewPositions.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ID2SIndexer.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/NameAndOptionalUIDSyntax.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ConfigurationElementCreatedEvent.java             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/NullBackend.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexBuffer.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPSocketFactory.java                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyDefinition.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/controls/ExternalChangelogRequestControl.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/CoreSchemaProvider.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/AlertHandler.java                                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/HostPort.java                                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskScheduleUserData.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/RC4PasswordStorageScheme.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/LDAPException.java                                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciListenerManager.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexQuery.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/AdditionalLogItem.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/SortValuesSet.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/GenerationIdChecksum.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ProgressStep.java                                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/Template.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/MeteredStream.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/DNPropertyDefinition.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBaseDNPanel.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/LDAPURL.java                                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/ConfigurationClient.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-class.png                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/WorkQueue.java                                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/event/BrowseActionListener.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPSocket.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/util/BackgroundTask.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/ErrorLogPublisher.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/server/AbstractConfigListenerAdaptor.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConstants.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/images/information.gif                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/AttributeIndexer.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/package-info.java                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/ManageAccount.java                                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/CompareOperationBasis.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/GroupManager.java                                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeAddOperation.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/SchemaElementSelectionEvent.java                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumBindRuleKeyword.java                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/package-info.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/RestartServerTask.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/SuffixNode.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/ChangelogState.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/AbstractUpgradeTask.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectNotFoundException.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/BackgroundTaskThread.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryIDSetSorter.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ProtocolVersion.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/webstart/package-info.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/TextComponentFocusListener.java                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectAlreadyExistsException.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/MatchingRuleConfigManager.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/util/cli/package-info.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/TimeDocumentFilter.java                   |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/DataReplicationOptions.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ECLMultiDomainDBCursor.java            |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-directory.png                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/TreeName.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsRmiServerSocketFactory.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/persistit/PitBackend.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS11KeyManagerProvider.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/IfAbsentTag.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsJmxPrincipal.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/OtherMailboxSyntax.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ASN1ByteChannelReader.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/UnbindRequestProtocolOp.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/LicenseFile.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/CryptoManagerException.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/util/FileManager.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BackupCreatedListener.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/Cursor.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/package-info.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationMessageNotificationMessageTemplateElement.java  |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/CheckEntrySyntaxException.java                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEChangelogDB.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/admin/ads/TopologyCacheException.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/images/currentstep.png                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/SynchronizationProvider.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/config/ConfigAttribute.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/RootPrivilegeChangeListener.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfigurationObjectClassPanel.java                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationOperation.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/TextDebugLogPublisher.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/RandomPasswordGenerator.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractBrowseEntriesPanel.java                      |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfirmInitializeAndImportDialog.java                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/AttributeValueTag.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallerArgumentParser.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/ExtendedOperationHandler.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/CompositeDBCursor.java                 |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/FieldName.java                                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ErrorPanel.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/DurationPropertyDefinition.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationCompareOperation.java                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/util/ChangeRecordEntry.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/admin/ads/util/package-info.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/ModifyOperation.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/util/ServerConstants.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/CryptPasswordStorageScheme.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ReplicaCursor.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewEntryFromLDIFPanel.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/WritabilityMode.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/persistit/PersistItStorage.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/CustomCellRenderer.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/IntegerPropertyDefinition.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/DecodingException.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/InitializeAllReplicationUserData.java              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/crypto/package-info.java                                               |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/MonitoringTableModel.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JECompressedSchema.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SHA1PasswordStorageScheme.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/util/WebBrowserLauncher.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VLVIndex.java                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyConfigManager.java                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumTargetKeyword.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskClient.java                                            |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/event/MinimumSizeComponentListener.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ImportIDSet.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/TopCfgDefn.java                                                  |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/AttributeIndexer.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StatusPanel.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java          |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ObjectClassEditorPanel.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseUnbindOperation.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/LoggerAlarmHandler.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/StatusReplicationUserData.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/GeneralizedTimeEqualityMatchingRuleFactory.java                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/Tag.java                                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ServerStartMsg.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ApplicationException.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/QuickSetupCli.java                                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/DN2URI.java                                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPCompareOptions.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/PrintStreamListener.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDIFViewEntryPanel.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/TrustManagerProvider.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/common/ServerState.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/RawFilter.java                                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/GeneralizedTimeOrderingMatchingRuleFactory.java                 |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CategoryPanel.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/MsgQueue.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/TreeCellRenderer.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/package-info.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/DirectoryRMIClientSocketFactory.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfileStackFrame.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationModifyDNOperation.java                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationBasis.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseBindOperation.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchRequestProtocolOp.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPAttribute.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerEqualityMatchingRuleFactory.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/SubstringAssertionSyntax.java                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/DefaultBehaviorProviderVisitor.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/monitors/ConnectionHandlerMonitor.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/IndexSelectionEvent.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPCompare.java                                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/admin/ads/util/BlindHostnameVerifier.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyException.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/MakeLDIFInputStreamThread.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObjectDecodingException.java                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPConnection.java                                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/config/DNConfigAttribute.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/Category.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IDSetIterator.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/client/IllegalManagedObjectNameException.java                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/RmiAuthenticator.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/AdministratorAction.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/VerifyIndex.java                                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/server/package-info.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ErrorMsg.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BrowserCellRenderer.java                    |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetup.java                                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProvider.java          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/SafeReadExpectedAcksInfo.java                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/DiskSpaceMonitorHandler.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/util/TimeThread.java                                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/RootContainer.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/ConfigureDS.java                                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/Operation.java                                                   |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/ConfigFileHandler.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/status/StatusCliArgumentParser.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/MonoServerReplicationUserData.java                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/SSLConnectionFactory.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/InitializationException.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/GenericConstraint.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/images/error_large.gif                                             |    0 
 opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/package-info.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateValue.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/CurrentInstallStatus.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/MemberVirtualAttributeProvider.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/server/monitors/ParallelWorkQueueMonitor.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ReplServerStartMsg.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/NullLDAPMessage.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/SASLMechanismHandler.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/DataConfig.java                                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciHandler.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/CancelTaskTask.java                                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugMessageFormatter.java                                     |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/CertificateDialog.java                                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationDataSync.java                                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/DefinitionDecodingException.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/MatchingRuleTreeNode.java                      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AuthMethod.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateExactMatchingRuleFactory.java                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java                                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/FirstChangeNumberVirtualAttributeProvider.java      |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tasks/RestoreTask.java                                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/AESPasswordStorageScheme.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserAttr.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/AbsoluteInheritedDefaultBehaviorProvider.java                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/schema/UUIDEqualityMatchingRuleFactory.java                            |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tasks/RebuildTask.java                                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java                          |    0 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexFilter.java                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/server/api/InitializationCompletedListener.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseOperation.java                                 |    0 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/SetupLauncher.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/client/AdminSecurityException.java                               |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectDefinitionResource.java                             |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SystemInformationMonitoringPanel.java                |    0 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseModifyDNOperation.java                         |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-idx-ro.png                                    |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaElementPanel.java                              |    0 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryCacheCommon.java                                       |    0 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/CompareRequestProtocolOp.java                           |    0 
 opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/PresenceTag.java                                        |    0 
 opendj-server-legacy/src/main/java/org/opends/server/admin/condition/Condition.java                                         |    0 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java                                  |    0 
 1,818 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/opendj-server-legacy/pom.xml b/opendj-server-legacy/pom.xml
index d79a422..4aeebfb 100644
--- a/opendj-server-legacy/pom.xml
+++ b/opendj-server-legacy/pom.xml
@@ -445,10 +445,6 @@
             </goals>
             <configuration>
               <sources>
-                <source>src/server</source>
-                <source>src/quicksetup</source>
-                <source>src/ads</source>
-                <source>src/guitools</source>
                 <source>src/messages/generated</source>
                 <source>src/messages/src</source>
                 <source>src/admin/generated</source>
diff --git a/opendj-server-legacy/src/ads/org/opends/admin/ads/ADSContext.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java
similarity index 100%
rename from opendj-server-legacy/src/ads/org/opends/admin/ads/ADSContext.java
rename to opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java
diff --git a/opendj-server-legacy/src/ads/org/opends/admin/ads/ADSContextException.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContextException.java
similarity index 100%
rename from opendj-server-legacy/src/ads/org/opends/admin/ads/ADSContextException.java
rename to opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContextException.java
diff --git a/opendj-server-legacy/src/ads/org/opends/admin/ads/ADSContextHelper.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContextHelper.java
similarity index 100%
rename from opendj-server-legacy/src/ads/org/opends/admin/ads/ADSContextHelper.java
rename to opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContextHelper.java
diff --git a/opendj-server-legacy/src/ads/org/opends/admin/ads/ReplicaDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ReplicaDescriptor.java
similarity index 100%
rename from opendj-server-legacy/src/ads/org/opends/admin/ads/ReplicaDescriptor.java
rename to opendj-server-legacy/src/main/java/org/opends/admin/ads/ReplicaDescriptor.java
diff --git a/opendj-server-legacy/src/ads/org/opends/admin/ads/ServerDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java
similarity index 100%
rename from opendj-server-legacy/src/ads/org/opends/admin/ads/ServerDescriptor.java
rename to opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java
diff --git a/opendj-server-legacy/src/ads/org/opends/admin/ads/SubtreeDeleteControl.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/SubtreeDeleteControl.java
similarity index 100%
rename from opendj-server-legacy/src/ads/org/opends/admin/ads/SubtreeDeleteControl.java
rename to opendj-server-legacy/src/main/java/org/opends/admin/ads/SubtreeDeleteControl.java
diff --git a/opendj-server-legacy/src/ads/org/opends/admin/ads/SuffixDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/SuffixDescriptor.java
similarity index 100%
rename from opendj-server-legacy/src/ads/org/opends/admin/ads/SuffixDescriptor.java
rename to opendj-server-legacy/src/main/java/org/opends/admin/ads/SuffixDescriptor.java
diff --git a/opendj-server-legacy/src/ads/org/opends/admin/ads/TopologyCache.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/TopologyCache.java
similarity index 100%
rename from opendj-server-legacy/src/ads/org/opends/admin/ads/TopologyCache.java
rename to opendj-server-legacy/src/main/java/org/opends/admin/ads/TopologyCache.java
diff --git a/opendj-server-legacy/src/ads/org/opends/admin/ads/TopologyCacheException.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/TopologyCacheException.java
similarity index 100%
rename from opendj-server-legacy/src/ads/org/opends/admin/ads/TopologyCacheException.java
rename to opendj-server-legacy/src/main/java/org/opends/admin/ads/TopologyCacheException.java
diff --git a/opendj-server-legacy/src/ads/org/opends/admin/ads/TopologyCacheFilter.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/TopologyCacheFilter.java
similarity index 100%
rename from opendj-server-legacy/src/ads/org/opends/admin/ads/TopologyCacheFilter.java
rename to opendj-server-legacy/src/main/java/org/opends/admin/ads/TopologyCacheFilter.java
diff --git a/opendj-server-legacy/src/ads/org/opends/admin/ads/package-info.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/ads/org/opends/admin/ads/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/admin/ads/package-info.java
diff --git a/opendj-server-legacy/src/ads/org/opends/admin/ads/util/ApplicationKeyManager.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ApplicationKeyManager.java
similarity index 100%
rename from opendj-server-legacy/src/ads/org/opends/admin/ads/util/ApplicationKeyManager.java
rename to opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ApplicationKeyManager.java
diff --git a/opendj-server-legacy/src/ads/org/opends/admin/ads/util/ApplicationTrustManager.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ApplicationTrustManager.java
similarity index 100%
rename from opendj-server-legacy/src/ads/org/opends/admin/ads/util/ApplicationTrustManager.java
rename to opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ApplicationTrustManager.java
diff --git a/opendj-server-legacy/src/ads/org/opends/admin/ads/util/BlindHostnameVerifier.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/BlindHostnameVerifier.java
similarity index 100%
rename from opendj-server-legacy/src/ads/org/opends/admin/ads/util/BlindHostnameVerifier.java
rename to opendj-server-legacy/src/main/java/org/opends/admin/ads/util/BlindHostnameVerifier.java
diff --git a/opendj-server-legacy/src/ads/org/opends/admin/ads/util/BlindTrustManager.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/BlindTrustManager.java
similarity index 100%
rename from opendj-server-legacy/src/ads/org/opends/admin/ads/util/BlindTrustManager.java
rename to opendj-server-legacy/src/main/java/org/opends/admin/ads/util/BlindTrustManager.java
diff --git a/opendj-server-legacy/src/ads/org/opends/admin/ads/util/ConnectionUtils.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionUtils.java
similarity index 100%
rename from opendj-server-legacy/src/ads/org/opends/admin/ads/util/ConnectionUtils.java
rename to opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionUtils.java
diff --git a/opendj-server-legacy/src/ads/org/opends/admin/ads/util/OpendsCertificateException.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/OpendsCertificateException.java
similarity index 100%
rename from opendj-server-legacy/src/ads/org/opends/admin/ads/util/OpendsCertificateException.java
rename to opendj-server-legacy/src/main/java/org/opends/admin/ads/util/OpendsCertificateException.java
diff --git a/opendj-server-legacy/src/ads/org/opends/admin/ads/util/PreferredConnection.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/PreferredConnection.java
similarity index 100%
rename from opendj-server-legacy/src/ads/org/opends/admin/ads/util/PreferredConnection.java
rename to opendj-server-legacy/src/main/java/org/opends/admin/ads/util/PreferredConnection.java
diff --git a/opendj-server-legacy/src/ads/org/opends/admin/ads/util/ServerLoader.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ServerLoader.java
similarity index 100%
rename from opendj-server-legacy/src/ads/org/opends/admin/ads/util/ServerLoader.java
rename to opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ServerLoader.java
diff --git a/opendj-server-legacy/src/ads/org/opends/admin/ads/util/TrustedSocketFactory.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/TrustedSocketFactory.java
similarity index 100%
rename from opendj-server-legacy/src/ads/org/opends/admin/ads/util/TrustedSocketFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/admin/ads/util/TrustedSocketFactory.java
diff --git a/opendj-server-legacy/src/ads/org/opends/admin/ads/util/package-info.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/ads/org/opends/admin/ads/util/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/admin/ads/util/package-info.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ControlPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ControlPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ControlPanelArgumentParser.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanelArgumentParser.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ControlPanelArgumentParser.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanelArgumentParser.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanelLauncher.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanelLauncher.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/browser/AbstractNodeTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/AbstractNodeTask.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/browser/AbstractNodeTask.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/AbstractNodeTask.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/browser/BasicNodeError.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/BasicNodeError.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/browser/BasicNodeError.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/BasicNodeError.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/browser/BrowserController.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/BrowserController.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/browser/BrowserController.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/BrowserController.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/browser/IconPool.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/IconPool.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/browser/IconPool.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/IconPool.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/browser/LDAPConnectionPool.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/LDAPConnectionPool.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/browser/LDAPConnectionPool.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/LDAPConnectionPool.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/browser/NodeRefresher.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeRefresher.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/browser/NodeRefresher.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeRefresher.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/browser/NodeSearcherQueue.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeSearcherQueue.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/browser/NodeSearcherQueue.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeSearcherQueue.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/browser/ReferralLimitExceededException.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/ReferralLimitExceededException.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/browser/ReferralLimitExceededException.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/ReferralLimitExceededException.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/browser/SearchAbandonException.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/SearchAbandonException.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/browser/SearchAbandonException.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/SearchAbandonException.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/browser/package-info.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/browser/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/package-info.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/AbstractIndexDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/AbstractIndexDescriptor.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/AbstractIndexDescriptor.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/AbstractIndexDescriptor.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/AbstractIndexTableModel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/AbstractIndexTableModel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/AbstractIndexTableModel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/AbstractIndexTableModel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/Action.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/Action.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/Action.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/Action.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/BackendDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BackendDescriptor.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/BackendDescriptor.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BackendDescriptor.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/BackupDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BackupDescriptor.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/BackupDescriptor.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BackupDescriptor.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/BackupTableModel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BackupTableModel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/BackupTableModel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BackupTableModel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/BaseDNTableModel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNTableModel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/BaseDNTableModel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNTableModel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/BasicMonitoringAttributes.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BasicMonitoringAttributes.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/BasicMonitoringAttributes.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BasicMonitoringAttributes.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/BinaryValue.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BinaryValue.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/BinaryValue.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BinaryValue.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/CannotRenameException.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/CannotRenameException.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/CannotRenameException.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/CannotRenameException.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/CategorizedComboBoxElement.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/CategorizedComboBoxElement.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/CategorizedComboBoxElement.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/CategorizedComboBoxElement.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/Category.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/Category.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/Category.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/Category.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/CheckEntrySyntaxException.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/CheckEntrySyntaxException.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/CheckEntrySyntaxException.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/CheckEntrySyntaxException.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/ConfigReadException.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConfigReadException.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/ConfigReadException.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConfigReadException.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerDescriptor.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerDescriptor.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerDescriptor.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerTableModel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerTableModel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerTableModel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerTableModel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/ConnectionHandlersMonitoringTableModel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlersMonitoringTableModel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/ConnectionHandlersMonitoringTableModel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlersMonitoringTableModel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/ConnectionProtocolPolicy.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionProtocolPolicy.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/ConnectionProtocolPolicy.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionProtocolPolicy.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/ControlPanelInfo.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ControlPanelInfo.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/ControlPanelInfo.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ControlPanelInfo.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/DBEnvironmentMonitoringTableModel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/DBEnvironmentMonitoringTableModel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/DBEnvironmentMonitoringTableModel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/DBEnvironmentMonitoringTableModel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/IndexTableModel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/IndexTableModel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/IndexTableModel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/IndexTableModel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/MonitoringAttributes.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/MonitoringAttributes.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/MonitoringAttributes.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/MonitoringAttributes.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/MonitoringTableModel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/MonitoringTableModel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/MonitoringTableModel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/MonitoringTableModel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/ObjectClassValue.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ObjectClassValue.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/ObjectClassValue.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ObjectClassValue.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/ScheduleType.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ScheduleType.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/ScheduleType.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ScheduleType.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/SortableListModel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/SortableListModel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/SortableListModel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/SortableListModel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/SortableTableModel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/SortableTableModel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/SortableTableModel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/SortableTableModel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/TaskTableModel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/TaskTableModel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/TaskTableModel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/TaskTableModel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/VLVIndexDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVIndexDescriptor.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/VLVIndexDescriptor.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVIndexDescriptor.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/VLVIndexTableModel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVIndexTableModel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/VLVIndexTableModel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVIndexTableModel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/VLVSortOrder.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVSortOrder.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/VLVSortOrder.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVSortOrder.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/package-info.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/datamodel/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/package-info.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/BackendPopulatedEvent.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BackendPopulatedEvent.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/BackendPopulatedEvent.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BackendPopulatedEvent.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/BackendPopulatedListener.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BackendPopulatedListener.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/BackendPopulatedListener.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BackendPopulatedListener.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/BackupCreatedEvent.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BackupCreatedEvent.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/BackupCreatedEvent.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BackupCreatedEvent.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/BackupCreatedListener.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BackupCreatedListener.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/BackupCreatedListener.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BackupCreatedListener.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/BrowseActionListener.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BrowseActionListener.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/BrowseActionListener.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BrowseActionListener.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/BrowserEvent.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BrowserEvent.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/BrowserEvent.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BrowserEvent.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/BrowserEventListener.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BrowserEventListener.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/BrowserEventListener.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BrowserEventListener.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/ClickTooltipDisplayer.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ClickTooltipDisplayer.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/ClickTooltipDisplayer.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ClickTooltipDisplayer.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/ComboKeySelectionManager.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ComboKeySelectionManager.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/ComboKeySelectionManager.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ComboKeySelectionManager.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/ConfigChangeListener.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ConfigChangeListener.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/ConfigChangeListener.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ConfigChangeListener.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/ConfigurationChangeEvent.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ConfigurationChangeEvent.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/ConfigurationChangeEvent.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ConfigurationChangeEvent.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/ConfigurationElementCreatedEvent.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ConfigurationElementCreatedEvent.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/ConfigurationElementCreatedEvent.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ConfigurationElementCreatedEvent.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/ConfigurationElementCreatedListener.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ConfigurationElementCreatedListener.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/ConfigurationElementCreatedListener.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ConfigurationElementCreatedListener.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/EntryReadErrorEvent.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/EntryReadErrorEvent.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/EntryReadErrorEvent.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/EntryReadErrorEvent.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/EntryReadEvent.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/EntryReadEvent.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/EntryReadEvent.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/EntryReadEvent.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/EntryReadListener.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/EntryReadListener.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/EntryReadListener.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/EntryReadListener.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/IndexModifiedEvent.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/IndexModifiedEvent.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/IndexModifiedEvent.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/IndexModifiedEvent.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/IndexModifiedListener.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/IndexModifiedListener.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/IndexModifiedListener.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/IndexModifiedListener.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/IndexSelectionEvent.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/IndexSelectionEvent.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/IndexSelectionEvent.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/IndexSelectionEvent.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/IndexSelectionListener.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/IndexSelectionListener.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/IndexSelectionListener.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/IndexSelectionListener.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/LDAPEntryChangedEvent.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/LDAPEntryChangedEvent.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/LDAPEntryChangedEvent.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/LDAPEntryChangedEvent.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/LDAPEntryChangedListener.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/LDAPEntryChangedListener.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/LDAPEntryChangedListener.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/LDAPEntryChangedListener.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/MoveEvent.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/MoveEvent.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/MoveEvent.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/MoveEvent.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/MoveListener.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/MoveListener.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/MoveListener.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/MoveListener.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/PrintStreamListener.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/PrintStreamListener.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/PrintStreamListener.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/PrintStreamListener.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/ReferralAuthenticationListener.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ReferralAuthenticationListener.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/ReferralAuthenticationListener.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ReferralAuthenticationListener.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/SchemaElementSelectionEvent.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/SchemaElementSelectionEvent.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/SchemaElementSelectionEvent.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/SchemaElementSelectionEvent.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/SchemaElementSelectionListener.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/SchemaElementSelectionListener.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/SchemaElementSelectionListener.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/SchemaElementSelectionListener.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/ScrollPaneBorderListener.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ScrollPaneBorderListener.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/ScrollPaneBorderListener.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ScrollPaneBorderListener.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/SuperiorObjectClassesChangedEvent.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/SuperiorObjectClassesChangedEvent.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/SuperiorObjectClassesChangedEvent.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/SuperiorObjectClassesChangedEvent.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/SuperiorObjectClassesChangedListener.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/SuperiorObjectClassesChangedListener.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/SuperiorObjectClassesChangedListener.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/SuperiorObjectClassesChangedListener.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/TextComponentFocusListener.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/TextComponentFocusListener.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/TextComponentFocusListener.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/TextComponentFocusListener.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/package-info.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/event/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/package-info.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/clear-filter-down.png b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/clear-filter-down.png
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/clear-filter-down.png
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/clear-filter-down.png
Binary files differ
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/clear-filter.png b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/clear-filter.png
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/clear-filter.png
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/clear-filter.png
Binary files differ
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/downarrow.png b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/downarrow.png
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/downarrow.png
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/downarrow.png
Binary files differ
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-attr-folder.png b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-attr-folder.png
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-attr-folder.png
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-attr-folder.png
Binary files differ
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-attr.png b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-attr.png
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-attr.png
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-attr.png
Binary files differ
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-class-folder.png b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-class-folder.png
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-class-folder.png
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-class-folder.png
Binary files differ
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-class.png b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-class.png
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-class.png
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-class.png
Binary files differ
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-directory.png b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-directory.png
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-directory.png
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-directory.png
Binary files differ
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-folder.png b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-folder.png
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-folder.png
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-folder.png
Binary files differ
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-generic.png b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-generic.png
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-generic.png
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-generic.png
Binary files differ
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-group.png b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-group.png
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-group.png
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-group.png
Binary files differ
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-idx-folder.png b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-idx-folder.png
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-idx-folder.png
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-idx-folder.png
Binary files differ
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-idx-ro.png b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-idx-ro.png
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-idx-ro.png
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-idx-ro.png
Binary files differ
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-idx.png b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-idx.png
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-idx.png
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-idx.png
Binary files differ
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-ou.png b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-ou.png
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-ou.png
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-ou.png
Binary files differ
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-ppol.png b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-ppol.png
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-ppol.png
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-ppol.png
Binary files differ
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-referral.png b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-referral.png
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-referral.png
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-referral.png
Binary files differ
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-rule-folder.png b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-rule-folder.png
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-rule-folder.png
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-rule-folder.png
Binary files differ
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-rule.png b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-rule.png
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-rule.png
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-rule.png
Binary files differ
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-suffix.png b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-suffix.png
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-suffix.png
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-suffix.png
Binary files differ
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-syntax-folder.png b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-syntax-folder.png
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-syntax-folder.png
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-syntax-folder.png
Binary files differ
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-syntax.png b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-syntax.png
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-syntax.png
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-syntax.png
Binary files differ
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-user.png b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-user.png
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-user.png
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-user.png
Binary files differ
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-vlv-idx-folder.png b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-vlv-idx-folder.png
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-vlv-idx-folder.png
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-vlv-idx-folder.png
Binary files differ
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-vlv-idx.png b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-vlv-idx.png
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/ds-vlv-idx.png
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/ds-vlv-idx.png
Binary files differ
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/field-locked.png b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/field-locked.png
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/field-locked.png
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/field-locked.png
Binary files differ
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/package-info.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/package-info.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/required.gif b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/required.gif
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/required.gif
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/required.gif
Binary files differ
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/rightarrow.png b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/rightarrow.png
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/images/rightarrow.png
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/images/rightarrow.png
Binary files differ
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/package-info.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/package-info.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/AddToGroupTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/AddToGroupTask.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/AddToGroupTask.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/AddToGroupTask.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/CancelTaskTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/CancelTaskTask.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/CancelTaskTask.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/CancelTaskTask.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/DeleteEntryTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/DeleteIndexTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteIndexTask.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/DeleteIndexTask.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteIndexTask.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/IndexTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/IndexTask.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/IndexTask.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/IndexTask.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/ModifyAttributeTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyAttributeTask.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/ModifyAttributeTask.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyAttributeTask.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/ModifyEntryTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/ModifyObjectClassTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyObjectClassTask.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/ModifyObjectClassTask.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyObjectClassTask.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/NewEntryTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/NewEntryTask.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/NewSchemaElementsTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewSchemaElementsTask.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/NewSchemaElementsTask.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewSchemaElementsTask.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/OfflineUpdateException.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/OfflineUpdateException.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/OfflineUpdateException.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/OfflineUpdateException.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/OnlineUpdateException.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/OnlineUpdateException.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/OnlineUpdateException.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/OnlineUpdateException.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/RebuildIndexTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/RebuildIndexTask.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/RebuildIndexTask.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/RebuildIndexTask.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/RestartServerTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/RestartServerTask.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/RestartServerTask.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/RestartServerTask.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/StartServerTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StartServerTask.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/StartServerTask.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StartServerTask.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/StartStopTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StartStopTask.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/StartStopTask.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StartStopTask.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/StopServerTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StopServerTask.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/StopServerTask.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StopServerTask.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/Task.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/Task.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/Task.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/Task.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/package-info.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/task/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/package-info.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/AbstractBackendIndexesPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractBackendIndexesPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/AbstractBackendIndexesPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractBackendIndexesPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/AbstractBrowseEntriesPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractBrowseEntriesPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/AbstractBrowseEntriesPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractBrowseEntriesPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/AbstractIndexPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractIndexPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/AbstractIndexPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractIndexPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/AddToGroupPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AddToGroupPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/AddToGroupPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AddToGroupPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/AttributeSyntaxPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AttributeSyntaxPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/AttributeSyntaxPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AttributeSyntaxPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/BackendIndexesPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackendIndexesPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/BackendIndexesPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackendIndexesPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/BackendVLVIndexesPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackendVLVIndexesPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/BackendVLVIndexesPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackendVLVIndexesPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/BackupListPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackupListPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/BackupListPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackupListPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/BackupPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackupPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/BackupPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackupPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/BaseDNPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BaseDNPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/BaseDNPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BaseDNPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/BinaryAttributeEditorPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BinaryAttributeEditorPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/BinaryAttributeEditorPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BinaryAttributeEditorPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/BinaryValuePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BinaryValuePanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/BinaryValuePanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BinaryValuePanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/BrowseGeneralMonitoringPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseGeneralMonitoringPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/BrowseGeneralMonitoringPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseGeneralMonitoringPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/BrowseIndexPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseIndexPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/BrowseIndexPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseIndexPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/ColorAndFontConstants.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ColorAndFontConstants.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/ColorAndFontConstants.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ColorAndFontConstants.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/ConfigurationAttributePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfigurationAttributePanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/ConfigurationAttributePanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfigurationAttributePanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/ConfigurationObjectClassPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfigurationObjectClassPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/ConfigurationObjectClassPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfigurationObjectClassPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/ConfirmInitializeAndImportDialog.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfirmInitializeAndImportDialog.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/ConfirmInitializeAndImportDialog.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfirmInitializeAndImportDialog.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/ConnectionHandlerMonitoringPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConnectionHandlerMonitoringPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/ConnectionHandlerMonitoringPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConnectionHandlerMonitoringPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/ControlCenterMainPane.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ControlCenterMainPane.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/ControlCenterMainPane.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ControlCenterMainPane.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/DBEnvironmentMonitoringPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DBEnvironmentMonitoringPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/DBEnvironmentMonitoringPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DBEnvironmentMonitoringPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/DeleteBackendPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBackendPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/DeleteBackendPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBackendPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/DeleteBaseDNPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBaseDNPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/DeleteBaseDNPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBaseDNPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/EntryCachesMonitoringPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/EntryCachesMonitoringPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/EntryCachesMonitoringPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/EntryCachesMonitoringPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/ErrorPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ErrorPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/ErrorPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ErrorPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/ErrorSearchingEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ErrorSearchingEntryPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/ErrorSearchingEntryPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ErrorSearchingEntryPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/ExportLDIFPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ExportLDIFPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/ExportLDIFPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ExportLDIFPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/GeneralMonitoringPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GeneralMonitoringPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/GeneralMonitoringPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GeneralMonitoringPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/GeneralMonitoringRightPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GeneralMonitoringRightPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/GeneralMonitoringRightPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GeneralMonitoringRightPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/GenericDialog.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericDialog.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/GenericDialog.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericDialog.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/GenericFrame.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericFrame.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/GenericFrame.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericFrame.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/GenericMenuBar.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericMenuBar.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/GenericMenuBar.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericMenuBar.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/IndexBrowserRightPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/IndexBrowserRightPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/IndexBrowserRightPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/IndexBrowserRightPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/IndexPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/IndexPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/IndexPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/IndexPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/JavaInformationMonitoringPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaInformationMonitoringPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/JavaInformationMonitoringPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaInformationMonitoringPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/LDAPEntrySelectionPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntrySelectionPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/LDAPEntrySelectionPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntrySelectionPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/LDIFViewEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDIFViewEntryPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/LDIFViewEntryPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDIFViewEntryPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/LoginPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LoginPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/LoginPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LoginPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/MainActionsPane.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MainActionsPane.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/MainActionsPane.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MainActionsPane.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/MainMenuBar.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MainMenuBar.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/MainMenuBar.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MainMenuBar.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/MatchingRulePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MatchingRulePanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/MatchingRulePanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MatchingRulePanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/MonitoringAttributesViewPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MonitoringAttributesViewPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/MonitoringAttributesViewPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MonitoringAttributesViewPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/NewDomainPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewDomainPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/NewDomainPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewDomainPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/NewEntryFromLDIFPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewEntryFromLDIFPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/NewEntryFromLDIFPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewEntryFromLDIFPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/NewGroupPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewGroupPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/NewGroupPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewGroupPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/NewIndexPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewIndexPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/NewIndexPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewIndexPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/NewOrganizationPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/NewOrganizationPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/NewOrganizationalUnitPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationalUnitPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/NewOrganizationalUnitPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationalUnitPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/NewUserPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewUserPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/NewUserPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewUserPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/NoItemSelectedPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NoItemSelectedPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/NoItemSelectedPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NoItemSelectedPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/ObjectClassEditorPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ObjectClassEditorPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/ObjectClassEditorPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ObjectClassEditorPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/ProgressDialog.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ProgressDialog.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/ProgressDialog.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ProgressDialog.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/RebuildIndexPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RebuildIndexPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/RebuildIndexPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RebuildIndexPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/RefreshOptionsPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RefreshOptionsPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/RefreshOptionsPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RefreshOptionsPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/ResetUserPasswordPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ResetUserPasswordPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/ResetUserPasswordPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ResetUserPasswordPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/RestorePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RestorePanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/RestorePanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RestorePanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/RootMonitoringPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RootMonitoringPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/RootMonitoringPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RootMonitoringPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/SchemaBrowserRightPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaBrowserRightPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/SchemaBrowserRightPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaBrowserRightPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/SchemaElementPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaElementPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/SchemaElementPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaElementPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/SelectObjectClassesPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SelectObjectClassesPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/SelectObjectClassesPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SelectObjectClassesPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/StandardObjectClassPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardObjectClassPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/StandardObjectClassPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardObjectClassPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/StatusPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StatusPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/StatusPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StatusPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/SystemInformationMonitoringPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SystemInformationMonitoringPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/SystemInformationMonitoringPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SystemInformationMonitoringPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/TaskToSchedulePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TaskToSchedulePanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/TaskToSchedulePanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TaskToSchedulePanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/UnsavedChangesDialog.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/UnsavedChangesDialog.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/UnsavedChangesDialog.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/UnsavedChangesDialog.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/VerifyIndexPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VerifyIndexPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/VerifyIndexPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VerifyIndexPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/WindowsServicePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/WindowsServicePanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/WindowsServicePanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/WindowsServicePanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/WorkQueueMonitoringPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/WorkQueueMonitoringPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/WorkQueueMonitoringPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/WorkQueueMonitoringPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/border/AccordionElementBorder.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/border/AccordionElementBorder.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/border/AccordionElementBorder.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/border/AccordionElementBorder.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/border/SelectedCategoryBorder.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/border/SelectedCategoryBorder.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/border/SelectedCategoryBorder.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/border/SelectedCategoryBorder.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/border/package-info.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/border/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/border/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/border/package-info.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/ActionButton.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/ActionButton.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/ActionButton.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/ActionButton.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/AddRemovePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/AddRemovePanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/AddRemovePanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/AddRemovePanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/BasicExpander.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/BasicExpander.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/BasicExpander.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/BasicExpander.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/BinaryCellPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/BinaryCellPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/BinaryCellPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/BinaryCellPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/CategoryButton.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CategoryButton.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/CategoryButton.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CategoryButton.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/CategoryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CategoryPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/CategoryPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CategoryPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/CellEditorButton.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CellEditorButton.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/CellEditorButton.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CellEditorButton.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/CustomTree.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CustomTree.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/CustomTree.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CustomTree.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/DoubleAddRemovePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/DoubleAddRemovePanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/DoubleAddRemovePanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/DoubleAddRemovePanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/FilterTextField.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/FilterTextField.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/FilterTextField.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/FilterTextField.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/LabelWithHelpIcon.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/LabelWithHelpIcon.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/LabelWithHelpIcon.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/LabelWithHelpIcon.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/NumericLimitedSizeDocumentFilter.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/NumericLimitedSizeDocumentFilter.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/NumericLimitedSizeDocumentFilter.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/NumericLimitedSizeDocumentFilter.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/ObjectClassCellPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/ObjectClassCellPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/ObjectClassCellPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/ObjectClassCellPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/ScheduleSummaryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/ScheduleSummaryPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/ScheduleSummaryPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/ScheduleSummaryPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/SelectableLabelWithHelpIcon.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/SelectableLabelWithHelpIcon.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/SelectableLabelWithHelpIcon.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/SelectableLabelWithHelpIcon.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/SuperiorObjectClassesEditor.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/SuperiorObjectClassesEditor.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/SuperiorObjectClassesEditor.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/SuperiorObjectClassesEditor.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/TimeDocumentFilter.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/TimeDocumentFilter.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/TimeDocumentFilter.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/TimeDocumentFilter.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/TitlePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/TitlePanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/TitlePanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/TitlePanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/TreePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/TreePanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/TreePanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/TreePanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/package-info.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/components/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/package-info.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/AbstractIndexTreeNode.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/AbstractIndexTreeNode.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/AbstractIndexTreeNode.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/AbstractIndexTreeNode.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/AttributeSyntaxTreeNode.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/AttributeSyntaxTreeNode.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/AttributeSyntaxTreeNode.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/AttributeSyntaxTreeNode.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/BasicNode.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/BasicNode.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/BasicNode.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/BasicNode.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/BrowserNodeInfo.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/BrowserNodeInfo.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/BrowserNodeInfo.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/BrowserNodeInfo.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/CategoryTreeNode.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/CategoryTreeNode.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/CategoryTreeNode.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/CategoryTreeNode.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/ConfigurationAttributeTreeNode.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/ConfigurationAttributeTreeNode.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/ConfigurationAttributeTreeNode.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/ConfigurationAttributeTreeNode.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/ConfigurationObjectClassTreeNode.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/ConfigurationObjectClassTreeNode.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/ConfigurationObjectClassTreeNode.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/ConfigurationObjectClassTreeNode.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/CustomAttributeTreeNode.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/CustomAttributeTreeNode.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/CustomAttributeTreeNode.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/CustomAttributeTreeNode.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/CustomObjectClassTreeNode.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/CustomObjectClassTreeNode.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/CustomObjectClassTreeNode.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/CustomObjectClassTreeNode.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/DndBrowserNodes.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/DndBrowserNodes.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/DndBrowserNodes.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/DndBrowserNodes.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/GeneralMonitoringTreeNode.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/GeneralMonitoringTreeNode.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/GeneralMonitoringTreeNode.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/GeneralMonitoringTreeNode.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/IndexTreeNode.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/IndexTreeNode.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/IndexTreeNode.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/IndexTreeNode.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/MatchingRuleTreeNode.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/MatchingRuleTreeNode.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/MatchingRuleTreeNode.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/MatchingRuleTreeNode.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/RootNode.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/RootNode.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/RootNode.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/RootNode.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/SchemaElementTreeNode.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/SchemaElementTreeNode.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/SchemaElementTreeNode.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/SchemaElementTreeNode.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/StandardAttributeTreeNode.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/StandardAttributeTreeNode.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/StandardAttributeTreeNode.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/StandardAttributeTreeNode.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/StandardObjectClassTreeNode.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/StandardObjectClassTreeNode.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/StandardObjectClassTreeNode.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/StandardObjectClassTreeNode.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/SuffixNode.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/SuffixNode.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/SuffixNode.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/SuffixNode.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/VLVIndexTreeNode.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/VLVIndexTreeNode.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/VLVIndexTreeNode.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/VLVIndexTreeNode.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/package-info.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/nodes/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/package-info.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/package-info.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/package-info.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/renderer/AccessibleTableHeaderRenderer.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/AccessibleTableHeaderRenderer.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/renderer/AccessibleTableHeaderRenderer.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/AccessibleTableHeaderRenderer.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/renderer/AttributeCellEditor.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/AttributeCellEditor.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/renderer/AttributeCellEditor.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/AttributeCellEditor.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/renderer/BackupTableCellRenderer.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BackupTableCellRenderer.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/renderer/BackupTableCellRenderer.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BackupTableCellRenderer.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/renderer/BaseDNCellRenderer.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BaseDNCellRenderer.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/renderer/BaseDNCellRenderer.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BaseDNCellRenderer.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/renderer/BrowserCellRenderer.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BrowserCellRenderer.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/renderer/BrowserCellRenderer.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BrowserCellRenderer.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/renderer/CustomCellRenderer.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/CustomCellRenderer.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/renderer/CustomCellRenderer.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/CustomCellRenderer.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/renderer/CustomListCellRenderer.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/CustomListCellRenderer.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/renderer/CustomListCellRenderer.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/CustomListCellRenderer.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/renderer/IndexCellRenderer.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/IndexCellRenderer.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/renderer/IndexCellRenderer.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/IndexCellRenderer.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/renderer/IndexComboBoxCellRenderer.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/IndexComboBoxCellRenderer.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/renderer/IndexComboBoxCellRenderer.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/IndexComboBoxCellRenderer.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/renderer/LDAPEntryTableCellRenderer.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/LDAPEntryTableCellRenderer.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/renderer/LDAPEntryTableCellRenderer.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/LDAPEntryTableCellRenderer.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/renderer/NoLeftInsetCategoryComboBoxRenderer.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/NoLeftInsetCategoryComboBoxRenderer.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/renderer/NoLeftInsetCategoryComboBoxRenderer.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/NoLeftInsetCategoryComboBoxRenderer.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/renderer/SelectableTableCellRenderer.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/SelectableTableCellRenderer.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/renderer/SelectableTableCellRenderer.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/SelectableTableCellRenderer.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/renderer/TaskCellRenderer.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/TaskCellRenderer.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/renderer/TaskCellRenderer.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/TaskCellRenderer.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/renderer/TreeCellRenderer.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/TreeCellRenderer.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/renderer/TreeCellRenderer.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/TreeCellRenderer.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/renderer/VLVSortOrderRenderer.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/VLVSortOrderRenderer.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/renderer/VLVSortOrderRenderer.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/VLVSortOrderRenderer.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/renderer/package-info.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/ui/renderer/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/package-info.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/util/ApplicationPrintStream.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ApplicationPrintStream.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/util/ApplicationPrintStream.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ApplicationPrintStream.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/util/BackgroundTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/BackgroundTask.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/util/BackgroundTask.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/BackgroundTask.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/util/BackgroundTaskThread.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/BackgroundTaskThread.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/util/BackgroundTaskThread.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/BackgroundTaskThread.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/util/BlindApplicationTrustManager.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/BlindApplicationTrustManager.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/util/BlindApplicationTrustManager.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/BlindApplicationTrustManager.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromFile.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromFile.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromFile.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromFile.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/util/ConfigReader.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigReader.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/util/ConfigReader.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigReader.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/util/ControlPanelLog.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ControlPanelLog.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/util/ControlPanelLog.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ControlPanelLog.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/util/LDAPEntryReader.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/LDAPEntryReader.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/util/LDAPEntryReader.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/LDAPEntryReader.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/util/LowerCaseComparator.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/LowerCaseComparator.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/util/LowerCaseComparator.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/LowerCaseComparator.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/util/NumSubordinateHacker.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/NumSubordinateHacker.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/util/NumSubordinateHacker.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/NumSubordinateHacker.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/util/ProcessReader.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ProcessReader.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/util/ProcessReader.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ProcessReader.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/util/ReadOnlyConfigFileHandler.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ReadOnlyConfigFileHandler.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/util/ReadOnlyConfigFileHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ReadOnlyConfigFileHandler.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/util/RemoteSchemaLoader.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/RemoteSchemaLoader.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/util/RemoteSchemaLoader.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/RemoteSchemaLoader.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/util/SchemaLoader.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/SchemaLoader.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/util/SchemaLoader.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/SchemaLoader.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/util/ViewPositions.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ViewPositions.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/util/ViewPositions.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ViewPositions.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/util/package-info.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/controlpanel/util/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/package-info.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java b/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallCliHelper.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallCliHelper.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/uninstaller/UninstallData.java b/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallData.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/uninstaller/UninstallData.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallData.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/uninstaller/UninstallLauncher.java b/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallLauncher.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/uninstaller/UninstallLauncher.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallLauncher.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/uninstaller/UninstallProgressStep.java b/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallProgressStep.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/uninstaller/UninstallProgressStep.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallProgressStep.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/uninstaller/UninstallUserData.java b/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallUserData.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/uninstaller/UninstallUserData.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallUserData.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java b/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/Uninstaller.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/Uninstaller.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/uninstaller/UninstallerArgumentParser.java b/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallerArgumentParser.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/uninstaller/UninstallerArgumentParser.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallerArgumentParser.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/uninstaller/package-info.java b/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/uninstaller/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/package-info.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/uninstaller/ui/ConfirmUninstallPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/ui/ConfirmUninstallPanel.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/uninstaller/ui/ConfirmUninstallPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/ui/ConfirmUninstallPanel.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/uninstaller/ui/LoginDialog.java b/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/ui/LoginDialog.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/uninstaller/ui/LoginDialog.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/ui/LoginDialog.java
diff --git a/opendj-server-legacy/src/guitools/org/opends/guitools/uninstaller/ui/package-info.java b/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/ui/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/guitools/org/opends/guitools/uninstaller/ui/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/ui/package-info.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/Application.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/Application.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/Application.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/Application.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ApplicationException.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ApplicationException.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ApplicationException.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/ApplicationException.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/BuildInformation.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/BuildInformation.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/BuildInformation.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/BuildInformation.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ButtonName.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ButtonName.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ButtonName.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/ButtonName.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/CliApplication.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/CliApplication.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/CliApplication.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/CliApplication.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/CliUserInteraction.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/CliUserInteraction.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/CliUserInteraction.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/CliUserInteraction.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/Configuration.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/Configuration.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/Configuration.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/Configuration.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/Constants.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/Constants.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/Constants.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/Constants.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/CurrentInstallStatus.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/CurrentInstallStatus.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/CurrentInstallStatus.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/CurrentInstallStatus.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/Installation.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/Installation.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/Installation.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/Installation.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/JavaArguments.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/JavaArguments.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/JavaArguments.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/JavaArguments.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/Launcher.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/Launcher.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/Launcher.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/Launcher.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/LicenseFile.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/LicenseFile.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/LicenseFile.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/LicenseFile.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ProgressDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ProgressDescriptor.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ProgressDescriptor.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/ProgressDescriptor.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ProgressStep.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ProgressStep.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ProgressStep.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/ProgressStep.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ProgressUpdateListenerDelegate.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ProgressUpdateListenerDelegate.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ProgressUpdateListenerDelegate.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/ProgressUpdateListenerDelegate.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/QuickSetupCli.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/QuickSetupCli.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/QuickSetupCli.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/QuickSetupCli.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/QuickSetupLog.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/QuickSetupLog.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/QuickSetupLog.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/QuickSetupLog.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ReturnCode.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ReturnCode.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ReturnCode.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/ReturnCode.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/SecurityOptions.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/SecurityOptions.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/SecurityOptions.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/SecurityOptions.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/SplashScreen.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/SplashScreen.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/SplashScreen.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/SplashScreen.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/Status.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/Status.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/Status.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/Status.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/Step.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/Step.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/Step.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/Step.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/UserData.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/UserData.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/UserData.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/UserData.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/UserDataCertificateException.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/UserDataCertificateException.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/UserDataCertificateException.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/UserDataCertificateException.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/UserDataConfirmationException.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/UserDataConfirmationException.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/UserDataConfirmationException.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/UserDataConfirmationException.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/UserDataException.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/UserDataException.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/UserDataException.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/UserDataException.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/UserInteraction.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/UserInteraction.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/UserInteraction.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/UserInteraction.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/WizardStep.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/WizardStep.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/WizardStep.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/WizardStep.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/event/BrowseActionListener.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/event/BrowseActionListener.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/event/BrowseActionListener.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/event/BrowseActionListener.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/event/ButtonActionListener.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/event/ButtonActionListener.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/event/ButtonActionListener.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/event/ButtonActionListener.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/event/ButtonEvent.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/event/ButtonEvent.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/event/ButtonEvent.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/event/ButtonEvent.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/event/MinimumSizeComponentListener.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/event/MinimumSizeComponentListener.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/event/MinimumSizeComponentListener.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/event/MinimumSizeComponentListener.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/event/ProgressNotifier.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/event/ProgressNotifier.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/event/ProgressNotifier.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/event/ProgressNotifier.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/event/ProgressUpdateEvent.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/event/ProgressUpdateEvent.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/event/ProgressUpdateEvent.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/event/ProgressUpdateEvent.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/event/ProgressUpdateListener.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/event/ProgressUpdateListener.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/event/ProgressUpdateListener.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/event/ProgressUpdateListener.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/event/package-info.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/event/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/event/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/event/package-info.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/currentstep.gif b/opendj-server-legacy/src/main/java/org/opends/quicksetup/images/currentstep.gif
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/currentstep.gif
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/images/currentstep.gif
Binary files differ
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/currentstep.png b/opendj-server-legacy/src/main/java/org/opends/quicksetup/images/currentstep.png
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/currentstep.png
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/images/currentstep.png
Binary files differ
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/divider-left.png b/opendj-server-legacy/src/main/java/org/opends/quicksetup/images/divider-left.png
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/divider-left.png
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/images/divider-left.png
Binary files differ
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/divider-right.png b/opendj-server-legacy/src/main/java/org/opends/quicksetup/images/divider-right.png
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/divider-right.png
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/images/divider-right.png
Binary files differ
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/error.gif b/opendj-server-legacy/src/main/java/org/opends/quicksetup/images/error.gif
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/error.gif
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/images/error.gif
Binary files differ
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/error_large.gif b/opendj-server-legacy/src/main/java/org/opends/quicksetup/images/error_large.gif
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/error_large.gif
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/images/error_large.gif
Binary files differ
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/error_medium.gif b/opendj-server-legacy/src/main/java/org/opends/quicksetup/images/error_medium.gif
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/error_medium.gif
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/images/error_medium.gif
Binary files differ
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/error_small.gif b/opendj-server-legacy/src/main/java/org/opends/quicksetup/images/error_small.gif
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/error_small.gif
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/images/error_small.gif
Binary files differ
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/help_large.gif b/opendj-server-legacy/src/main/java/org/opends/quicksetup/images/help_large.gif
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/help_large.gif
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/images/help_large.gif
Binary files differ
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/help_medium.gif b/opendj-server-legacy/src/main/java/org/opends/quicksetup/images/help_medium.gif
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/help_medium.gif
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/images/help_medium.gif
Binary files differ
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/help_small.gif b/opendj-server-legacy/src/main/java/org/opends/quicksetup/images/help_small.gif
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/help_small.gif
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/images/help_small.gif
Binary files differ
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/info_large.gif b/opendj-server-legacy/src/main/java/org/opends/quicksetup/images/info_large.gif
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/info_large.gif
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/images/info_large.gif
Binary files differ
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/info_medium.gif b/opendj-server-legacy/src/main/java/org/opends/quicksetup/images/info_medium.gif
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/info_medium.gif
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/images/info_medium.gif
Binary files differ
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/info_small.gif b/opendj-server-legacy/src/main/java/org/opends/quicksetup/images/info_small.gif
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/info_small.gif
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/images/info_small.gif
Binary files differ
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/information.gif b/opendj-server-legacy/src/main/java/org/opends/quicksetup/images/information.gif
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/information.gif
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/images/information.gif
Binary files differ
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/opendjbackground.png b/opendj-server-legacy/src/main/java/org/opends/quicksetup/images/opendjbackground.png
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/opendjbackground.png
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/images/opendjbackground.png
Binary files differ
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/opendjminimized.gif b/opendj-server-legacy/src/main/java/org/opends/quicksetup/images/opendjminimized.gif
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/opendjminimized.gif
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/images/opendjminimized.gif
Binary files differ
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/opendjminimizedmac.png b/opendj-server-legacy/src/main/java/org/opends/quicksetup/images/opendjminimizedmac.png
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/opendjminimizedmac.png
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/images/opendjminimizedmac.png
Binary files differ
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/opendjsplash.png b/opendj-server-legacy/src/main/java/org/opends/quicksetup/images/opendjsplash.png
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/opendjsplash.png
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/images/opendjsplash.png
Binary files differ
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/package-info.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/images/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/images/package-info.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/wait.gif b/opendj-server-legacy/src/main/java/org/opends/quicksetup/images/wait.gif
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/wait.gif
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/images/wait.gif
Binary files differ
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/wait_tiny.png b/opendj-server-legacy/src/main/java/org/opends/quicksetup/images/wait_tiny.png
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/wait_tiny.png
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/images/wait_tiny.png
Binary files differ
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/warning.gif b/opendj-server-legacy/src/main/java/org/opends/quicksetup/images/warning.gif
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/warning.gif
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/images/warning.gif
Binary files differ
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/warning_large.gif b/opendj-server-legacy/src/main/java/org/opends/quicksetup/images/warning_large.gif
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/warning_large.gif
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/images/warning_large.gif
Binary files differ
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/warning_medium.gif b/opendj-server-legacy/src/main/java/org/opends/quicksetup/images/warning_medium.gif
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/warning_medium.gif
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/images/warning_medium.gif
Binary files differ
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/warning_small.gif b/opendj-server-legacy/src/main/java/org/opends/quicksetup/images/warning_small.gif
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/images/warning_small.gif
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/images/warning_small.gif
Binary files differ
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/AuthenticationData.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/AuthenticationData.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/AuthenticationData.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/AuthenticationData.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/ConfiguredDomain.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ConfiguredDomain.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/ConfiguredDomain.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ConfiguredDomain.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/ConfiguredReplication.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ConfiguredReplication.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/ConfiguredReplication.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ConfiguredReplication.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/DataReplicationOptions.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/DataReplicationOptions.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/DataReplicationOptions.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/DataReplicationOptions.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/InstallProgressStep.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallProgressStep.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/InstallProgressStep.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallProgressStep.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/Installer.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/Installer.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallerHelper.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallerHelper.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/NewSuffixOptions.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/NewSuffixOptions.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/NewSuffixOptions.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/NewSuffixOptions.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/PeerNotFoundException.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/PeerNotFoundException.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/PeerNotFoundException.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/PeerNotFoundException.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/SetupLauncher.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/SetupLauncher.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/SetupLauncher.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/SetupLauncher.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/SuffixesToReplicateOptions.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/SuffixesToReplicateOptions.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/SuffixesToReplicateOptions.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/SuffixesToReplicateOptions.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/offline/OfflineInstaller.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/offline/OfflineInstaller.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/offline/OfflineInstaller.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/offline/OfflineInstaller.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/offline/package-info.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/offline/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/offline/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/offline/package-info.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/package-info.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/package-info.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/ui/DataOptionsPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/DataOptionsPanel.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/ui/DataOptionsPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/DataOptionsPanel.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/ui/DataReplicationPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/DataReplicationPanel.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/ui/DataReplicationPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/DataReplicationPanel.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/ui/GlobalAdministratorPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/GlobalAdministratorPanel.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/ui/GlobalAdministratorPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/GlobalAdministratorPanel.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/ui/InstallLicensePanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallLicensePanel.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/ui/InstallLicensePanel.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallLicensePanel.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/ui/InstallWelcomePanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallWelcomePanel.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/ui/InstallWelcomePanel.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallWelcomePanel.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/ui/RemoteReplicationPortsPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/RemoteReplicationPortsPanel.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/ui/RemoteReplicationPortsPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/RemoteReplicationPortsPanel.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/ui/RuntimeOptionsPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/RuntimeOptionsPanel.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/ui/RuntimeOptionsPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/RuntimeOptionsPanel.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/ui/SecurityOptionsDialog.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/SecurityOptionsDialog.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/ui/SecurityOptionsDialog.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/SecurityOptionsDialog.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/ui/SelectAliasDialog.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/SelectAliasDialog.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/ui/SelectAliasDialog.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/SelectAliasDialog.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/ui/ServerSettingsPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/ServerSettingsPanel.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/ui/ServerSettingsPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/ServerSettingsPanel.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/ui/SuffixesToReplicatePanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/SuffixesToReplicatePanel.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/ui/SuffixesToReplicatePanel.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/SuffixesToReplicatePanel.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/ui/package-info.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/ui/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/package-info.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/webstart/package-info.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/webstart/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/installer/webstart/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/webstart/package-info.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/package-info.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/package-info.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/ButtonsPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/ButtonsPanel.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/ButtonsPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/ButtonsPanel.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/CertificateDialog.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/CertificateDialog.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/CertificateDialog.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/CertificateDialog.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/CurrentStepPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/CurrentStepPanel.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/CurrentStepPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/CurrentStepPanel.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/CustomHTMLEditorKit.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/CustomHTMLEditorKit.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/CustomHTMLEditorKit.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/CustomHTMLEditorKit.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/FieldName.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/FieldName.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/FieldName.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/FieldName.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/FinishedPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/FinishedPanel.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/FinishedPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/FinishedPanel.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/FramePanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/FramePanel.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/FramePanel.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/FramePanel.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/GuiApplication.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/GuiApplication.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/GuiApplication.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/GuiApplication.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/LabelFieldDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/LabelFieldDescriptor.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/LabelFieldDescriptor.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/LabelFieldDescriptor.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/ProgressDialog.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/ProgressDialog.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/ProgressDialog.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/ProgressDialog.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/ProgressPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/ProgressPanel.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/ProgressPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/ProgressPanel.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/QuickSetup.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetup.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/QuickSetup.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetup.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/QuickSetupDialog.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetupDialog.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/QuickSetupDialog.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetupDialog.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/QuickSetupErrorPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetupErrorPanel.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/QuickSetupErrorPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetupErrorPanel.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/QuickSetupPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetupPanel.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/QuickSetupPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetupPanel.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/QuickSetupStepPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetupStepPanel.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/QuickSetupStepPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetupStepPanel.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/ReviewPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/ReviewPanel.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/ReviewPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/ReviewPanel.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/SortableTableModel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/SortableTableModel.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/SortableTableModel.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/SortableTableModel.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/StepsPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/StepsPanel.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/StepsPanel.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/StepsPanel.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/UIFactory.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/UIFactory.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/UIFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/UIFactory.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/Utilities.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/Utilities.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/Utilities.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/Utilities.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/WebBrowserErrorDialog.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/WebBrowserErrorDialog.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/WebBrowserErrorDialog.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/WebBrowserErrorDialog.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/package-info.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/ui/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/package-info.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/util/BackgroundTask.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/BackgroundTask.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/util/BackgroundTask.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/util/BackgroundTask.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/util/BackgroundTaskThread.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/BackgroundTaskThread.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/util/BackgroundTaskThread.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/util/BackgroundTaskThread.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/util/CompatibleJava.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/CompatibleJava.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/util/CompatibleJava.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/util/CompatibleJava.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/util/ExtensionFileFilter.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/ExtensionFileFilter.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/util/ExtensionFileFilter.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/util/ExtensionFileFilter.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/util/FileManager.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/FileManager.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/util/FileManager.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/util/FileManager.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/util/HtmlProgressMessageFormatter.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/HtmlProgressMessageFormatter.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/util/HtmlProgressMessageFormatter.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/util/HtmlProgressMessageFormatter.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/util/IncompatibleVersionException.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/IncompatibleVersionException.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/util/IncompatibleVersionException.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/util/IncompatibleVersionException.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/util/OutputReader.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/OutputReader.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/util/OutputReader.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/util/OutputReader.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/util/PlainTextProgressMessageFormatter.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/PlainTextProgressMessageFormatter.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/util/PlainTextProgressMessageFormatter.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/util/PlainTextProgressMessageFormatter.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/util/ProgressMessageFormatter.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/ProgressMessageFormatter.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/util/ProgressMessageFormatter.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/util/ProgressMessageFormatter.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/util/ServerController.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/ServerController.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/util/ServerController.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/util/ServerController.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/util/StandardOutputSuppressor.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/StandardOutputSuppressor.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/util/StandardOutputSuppressor.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/util/StandardOutputSuppressor.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/util/UIKeyStore.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/UIKeyStore.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/util/UIKeyStore.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/util/UIKeyStore.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/util/URLWorker.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/URLWorker.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/util/URLWorker.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/util/URLWorker.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/util/Utils.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/util/Utils.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/util/WebBrowserException.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/WebBrowserException.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/util/WebBrowserException.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/util/WebBrowserException.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/util/WebBrowserLauncher.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/WebBrowserLauncher.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/util/WebBrowserLauncher.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/util/WebBrowserLauncher.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/util/ZipExtractor.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/ZipExtractor.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/util/ZipExtractor.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/util/ZipExtractor.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/util/package-info.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/util/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/util/package-info.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/webstart/WebStartDownloader.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/webstart/WebStartDownloader.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/webstart/WebStartDownloader.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/webstart/WebStartDownloader.java
diff --git a/opendj-server-legacy/src/quicksetup/org/opends/quicksetup/webstart/package-info.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/webstart/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/quicksetup/org/opends/quicksetup/webstart/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/quicksetup/webstart/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/ACIPropertyDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/ACIPropertyDefinition.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/ACIPropertyDefinition.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/ACIPropertyDefinition.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/AbsoluteInheritedDefaultBehaviorProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/AbsoluteInheritedDefaultBehaviorProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/AbsoluteInheritedDefaultBehaviorProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/AbsoluteInheritedDefaultBehaviorProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/AbstractManagedObjectDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/AbstractManagedObjectDefinition.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/AbstractManagedObjectDefinition.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/AbstractManagedObjectDefinition.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/AdminException.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/AdminException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/AdminException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/AdminException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/AdministrationConnector.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationConnector.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/AdministrationConnector.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationConnector.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/AdministrationDataSync.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationDataSync.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/AdministrationDataSync.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationDataSync.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/AdministratorAction.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/AdministratorAction.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/AdministratorAction.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/AdministratorAction.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/AggregationPropertyDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/AggregationPropertyDefinition.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/AggregationPropertyDefinition.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/AggregationPropertyDefinition.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/AliasDefaultBehaviorProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/AliasDefaultBehaviorProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/AliasDefaultBehaviorProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/AliasDefaultBehaviorProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/AttributeTypePropertyDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/AttributeTypePropertyDefinition.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/AttributeTypePropertyDefinition.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/AttributeTypePropertyDefinition.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/BooleanPropertyDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/BooleanPropertyDefinition.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/BooleanPropertyDefinition.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/BooleanPropertyDefinition.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/ClassLoaderProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/ClassLoaderProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/ClassLoaderProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/ClassLoaderProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/ClassPropertyDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/ClassPropertyDefinition.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/ClassPropertyDefinition.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/ClassPropertyDefinition.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/Configuration.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/Configuration.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/Configuration.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/Configuration.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/ConfigurationClient.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/ConfigurationClient.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/ConfigurationClient.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/ConfigurationClient.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/Constraint.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/Constraint.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/Constraint.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/Constraint.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/DNPropertyDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/DNPropertyDefinition.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/DNPropertyDefinition.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/DNPropertyDefinition.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/DecodingException.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/DecodingException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/DecodingException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/DecodingException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/DefaultBehaviorProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/DefaultBehaviorProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/DefaultBehaviorProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/DefaultBehaviorProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/DefaultBehaviorProviderVisitor.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/DefaultBehaviorProviderVisitor.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/DefaultBehaviorProviderVisitor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/DefaultBehaviorProviderVisitor.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/DefaultManagedObject.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/DefaultManagedObject.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/DefaultManagedObject.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/DefaultManagedObject.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/DefinedDefaultBehaviorProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/DefinedDefaultBehaviorProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/DefinedDefaultBehaviorProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/DefinedDefaultBehaviorProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/DefinitionDecodingException.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/DefinitionDecodingException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/DefinitionDecodingException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/DefinitionDecodingException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/DefinitionResolver.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/DefinitionResolver.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/DefinitionResolver.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/DefinitionResolver.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/DurationPropertyDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/DurationPropertyDefinition.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/DurationPropertyDefinition.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/DurationPropertyDefinition.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/EnumPropertyDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/EnumPropertyDefinition.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/EnumPropertyDefinition.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/EnumPropertyDefinition.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/GenericConstraint.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/GenericConstraint.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/GenericConstraint.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/GenericConstraint.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/IPAddressMaskPropertyDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/IPAddressMaskPropertyDefinition.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/IPAddressMaskPropertyDefinition.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/IPAddressMaskPropertyDefinition.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/IPAddressPropertyDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/IPAddressPropertyDefinition.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/IPAddressPropertyDefinition.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/IPAddressPropertyDefinition.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/InstantiableRelationDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/InstantiableRelationDefinition.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/InstantiableRelationDefinition.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/InstantiableRelationDefinition.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/IntegerPropertyDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/IntegerPropertyDefinition.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/IntegerPropertyDefinition.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/IntegerPropertyDefinition.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/LDAPProfile.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/LDAPProfile.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/LDAPProfile.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/LDAPProfile.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/ManagedObjectAlreadyExistsException.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectAlreadyExistsException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/ManagedObjectAlreadyExistsException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectAlreadyExistsException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/ManagedObjectDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectDefinition.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/ManagedObjectDefinition.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectDefinition.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/ManagedObjectDefinitionI18NResource.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectDefinitionI18NResource.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/ManagedObjectDefinitionI18NResource.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectDefinitionI18NResource.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/ManagedObjectDefinitionResource.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectDefinitionResource.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/ManagedObjectDefinitionResource.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectDefinitionResource.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/ManagedObjectNotFoundException.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectNotFoundException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/ManagedObjectNotFoundException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectNotFoundException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/ManagedObjectOption.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectOption.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/ManagedObjectOption.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectOption.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/ManagedObjectPath.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectPath.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/ManagedObjectPath.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectPath.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/ManagedObjectPathSerializer.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectPathSerializer.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/ManagedObjectPathSerializer.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectPathSerializer.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/OperationsException.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/OperationsException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/OperationsException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/OperationsException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/OptionalRelationDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/OptionalRelationDefinition.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/OptionalRelationDefinition.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/OptionalRelationDefinition.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/PropertyDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyDefinition.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/PropertyDefinition.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyDefinition.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/PropertyDefinitionUsageBuilder.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyDefinitionUsageBuilder.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/PropertyDefinitionUsageBuilder.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyDefinitionUsageBuilder.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/PropertyDefinitionVisitor.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyDefinitionVisitor.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/PropertyDefinitionVisitor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyDefinitionVisitor.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/PropertyException.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/PropertyException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/PropertyNotFoundException.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyNotFoundException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/PropertyNotFoundException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyNotFoundException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/PropertyOption.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyOption.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/PropertyOption.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyOption.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/PropertyProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/PropertyProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/PropertyValueVisitor.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyValueVisitor.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/PropertyValueVisitor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyValueVisitor.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/Reference.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/Reference.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/Reference.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/Reference.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/RelationDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/RelationDefinition.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/RelationDefinition.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/RelationDefinition.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/RelationDefinitionVisitor.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/RelationDefinitionVisitor.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/RelationDefinitionVisitor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/RelationDefinitionVisitor.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/RelationOption.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/RelationOption.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/RelationOption.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/RelationOption.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/RelativeInheritedDefaultBehaviorProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/RelativeInheritedDefaultBehaviorProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/RelativeInheritedDefaultBehaviorProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/RelativeInheritedDefaultBehaviorProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/SetRelationDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/SetRelationDefinition.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/SetRelationDefinition.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/SetRelationDefinition.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/SingletonRelationDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/SingletonRelationDefinition.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/SingletonRelationDefinition.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/SingletonRelationDefinition.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/SizePropertyDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/SizePropertyDefinition.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/SizePropertyDefinition.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/SizePropertyDefinition.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/StringPropertyDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/StringPropertyDefinition.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/StringPropertyDefinition.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/StringPropertyDefinition.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/Tag.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/Tag.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/Tag.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/Tag.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/TopCfgDefn.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/TopCfgDefn.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/TopCfgDefn.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/TopCfgDefn.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/UndefinedDefaultBehaviorProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/UndefinedDefaultBehaviorProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/UndefinedDefaultBehaviorProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/UndefinedDefaultBehaviorProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/client/AdminClientException.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/AdminClientException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/client/AdminClientException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/client/AdminClientException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/client/AdminSecurityException.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/AdminSecurityException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/client/AdminSecurityException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/client/AdminSecurityException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/client/AuthenticationException.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/AuthenticationException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/client/AuthenticationException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/client/AuthenticationException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/client/AuthenticationNotSupportedException.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/AuthenticationNotSupportedException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/client/AuthenticationNotSupportedException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/client/AuthenticationNotSupportedException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/client/AuthorizationException.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/AuthorizationException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/client/AuthorizationException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/client/AuthorizationException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/client/ClientConstraintHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/ClientConstraintHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/client/ClientConstraintHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/client/ClientConstraintHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/client/CommunicationException.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/CommunicationException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/client/CommunicationException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/client/CommunicationException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/client/ConcurrentModificationException.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/ConcurrentModificationException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/client/ConcurrentModificationException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/client/ConcurrentModificationException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/client/IllegalManagedObjectNameException.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/IllegalManagedObjectNameException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/client/IllegalManagedObjectNameException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/client/IllegalManagedObjectNameException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/client/ManagedObject.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/ManagedObject.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/client/ManagedObject.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/client/ManagedObject.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/client/ManagedObjectDecodingException.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/ManagedObjectDecodingException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/client/ManagedObjectDecodingException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/client/ManagedObjectDecodingException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/client/ManagementContext.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/ManagementContext.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/client/ManagementContext.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/client/ManagementContext.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/client/MissingMandatoryPropertiesException.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/MissingMandatoryPropertiesException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/client/MissingMandatoryPropertiesException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/client/MissingMandatoryPropertiesException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/client/OperationRejectedException.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/OperationRejectedException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/client/OperationRejectedException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/client/OperationRejectedException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/client/cli/SecureConnectionCliParser.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliParser.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/client/cli/SecureConnectionCliParser.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliParser.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/client/cli/TaskScheduleArgs.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/TaskScheduleArgs.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/client/cli/TaskScheduleArgs.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/TaskScheduleArgs.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/client/cli/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/client/cli/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/client/ldap/JNDIDirContextAdaptor.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/JNDIDirContextAdaptor.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/client/ldap/JNDIDirContextAdaptor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/JNDIDirContextAdaptor.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/client/ldap/LDAPConnection.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/LDAPConnection.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/client/ldap/LDAPConnection.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/LDAPConnection.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/client/ldap/LDAPDriver.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/LDAPDriver.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/client/ldap/LDAPDriver.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/LDAPDriver.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/client/ldap/LDAPManagedObject.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/LDAPManagedObject.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/client/ldap/LDAPManagedObject.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/LDAPManagedObject.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/client/ldap/LDAPManagementContext.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/LDAPManagementContext.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/client/ldap/LDAPManagementContext.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/LDAPManagementContext.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/client/ldap/LDAPNameBuilder.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/LDAPNameBuilder.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/client/ldap/LDAPNameBuilder.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/LDAPNameBuilder.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/client/ldap/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/client/ldap/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/client/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/client/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/client/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/client/spi/AbstractManagedObject.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/AbstractManagedObject.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/client/spi/AbstractManagedObject.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/AbstractManagedObject.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/client/spi/Driver.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/Driver.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/client/spi/Driver.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/Driver.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/client/spi/Property.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/Property.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/client/spi/Property.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/Property.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/client/spi/PropertySet.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/PropertySet.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/client/spi/PropertySet.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/PropertySet.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/client/spi/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/client/spi/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/condition/ANDCondition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/condition/ANDCondition.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/condition/ANDCondition.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/condition/ANDCondition.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/condition/Condition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/condition/Condition.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/condition/Condition.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/condition/Condition.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/condition/Conditions.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/condition/Conditions.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/condition/Conditions.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/condition/Conditions.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/condition/ContainsCondition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/condition/ContainsCondition.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/condition/ContainsCondition.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/condition/ContainsCondition.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/condition/IsPresentCondition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/condition/IsPresentCondition.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/condition/IsPresentCondition.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/condition/IsPresentCondition.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/condition/NOTCondition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/condition/NOTCondition.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/condition/NOTCondition.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/condition/NOTCondition.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/condition/ORCondition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/condition/ORCondition.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/condition/ORCondition.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/condition/ORCondition.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/condition/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/condition/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/condition/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/condition/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/doc/ConfigGuideGeneration.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/doc/ConfigGuideGeneration.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/doc/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/doc/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/doc/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/doc/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/server/AbstractConfigListenerAdaptor.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/AbstractConfigListenerAdaptor.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/server/AbstractConfigListenerAdaptor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/server/AbstractConfigListenerAdaptor.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/server/ConfigAddListenerAdaptor.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigAddListenerAdaptor.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/server/ConfigAddListenerAdaptor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigAddListenerAdaptor.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/server/ConfigChangeListenerAdaptor.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigChangeListenerAdaptor.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/server/ConfigChangeListenerAdaptor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigChangeListenerAdaptor.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/server/ConfigDeleteListenerAdaptor.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigDeleteListenerAdaptor.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/server/ConfigDeleteListenerAdaptor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigDeleteListenerAdaptor.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/server/ConfigExceptionFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigExceptionFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/server/ConfigExceptionFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigExceptionFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/server/ConfigurationAddListener.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigurationAddListener.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/server/ConfigurationAddListener.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigurationAddListener.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/server/ConfigurationChangeListener.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigurationChangeListener.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/server/ConfigurationChangeListener.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigurationChangeListener.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/server/ConfigurationDeleteListener.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigurationDeleteListener.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/server/ConfigurationDeleteListener.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigurationDeleteListener.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/server/ConstraintViolationException.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConstraintViolationException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/server/ConstraintViolationException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConstraintViolationException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/server/DNBuilder.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/DNBuilder.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/server/DNBuilder.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/server/DNBuilder.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/server/DelayedConfigAddListener.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/DelayedConfigAddListener.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/server/DelayedConfigAddListener.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/server/DelayedConfigAddListener.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/server/ServerConstraintHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerConstraintHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/server/ServerConstraintHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerConstraintHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/server/ServerManagedObject.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObject.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/server/ServerManagedObject.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObject.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/server/ServerManagedObjectAddListener.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObjectAddListener.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/server/ServerManagedObjectAddListener.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObjectAddListener.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/server/ServerManagedObjectAddListenerAdaptor.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObjectAddListenerAdaptor.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/server/ServerManagedObjectAddListenerAdaptor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObjectAddListenerAdaptor.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/server/ServerManagedObjectChangeListener.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObjectChangeListener.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/server/ServerManagedObjectChangeListener.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObjectChangeListener.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/server/ServerManagedObjectChangeListenerAdaptor.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObjectChangeListenerAdaptor.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/server/ServerManagedObjectChangeListenerAdaptor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObjectChangeListenerAdaptor.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/server/ServerManagedObjectDecodingException.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObjectDecodingException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/server/ServerManagedObjectDecodingException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObjectDecodingException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/server/ServerManagedObjectDeleteListener.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObjectDeleteListener.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/server/ServerManagedObjectDeleteListener.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObjectDeleteListener.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/server/ServerManagedObjectDeleteListenerAdaptor.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObjectDeleteListenerAdaptor.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/server/ServerManagedObjectDeleteListenerAdaptor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObjectDeleteListenerAdaptor.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/server/ServerManagementContext.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagementContext.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/server/ServerManagementContext.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagementContext.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/admin/server/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/admin/server/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/admin/server/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/AccessControlHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/api/AccessControlHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/AccessControlHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/AccessControlHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/AccountStatusNotificationHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/api/AccountStatusNotificationHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/AccountStatusNotificationHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/AccountStatusNotificationHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/AlertGenerator.java b/opendj-server-legacy/src/main/java/org/opends/server/api/AlertGenerator.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/AlertGenerator.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/AlertGenerator.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/AlertHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/api/AlertHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/AlertHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/AlertHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/AttributeSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/api/AttributeSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/AttributeSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/AttributeSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/AuthenticationPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicy.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/AuthenticationPolicy.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicy.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/AuthenticationPolicyFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicyFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/AuthenticationPolicyFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicyFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/AuthenticationPolicyState.java b/opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicyState.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/AuthenticationPolicyState.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicyState.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/Backend.java b/opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/Backend.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/BackendInitializationListener.java b/opendj-server-legacy/src/main/java/org/opends/server/api/BackendInitializationListener.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/BackendInitializationListener.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/BackendInitializationListener.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/BackupTaskListener.java b/opendj-server-legacy/src/main/java/org/opends/server/api/BackupTaskListener.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/BackupTaskListener.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/BackupTaskListener.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/CertificateMapper.java b/opendj-server-legacy/src/main/java/org/opends/server/api/CertificateMapper.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/CertificateMapper.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/CertificateMapper.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/ClientConnection.java b/opendj-server-legacy/src/main/java/org/opends/server/api/ClientConnection.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/ClientConnection.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/ClientConnection.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/CompressedSchema.java b/opendj-server-legacy/src/main/java/org/opends/server/api/CompressedSchema.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/CompressedSchema.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/CompressedSchema.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/ConfigAddListener.java b/opendj-server-legacy/src/main/java/org/opends/server/api/ConfigAddListener.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/ConfigAddListener.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/ConfigAddListener.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/ConfigChangeListener.java b/opendj-server-legacy/src/main/java/org/opends/server/api/ConfigChangeListener.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/ConfigChangeListener.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/ConfigChangeListener.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/ConfigDeleteListener.java b/opendj-server-legacy/src/main/java/org/opends/server/api/ConfigDeleteListener.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/ConfigDeleteListener.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/ConfigDeleteListener.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/ConfigHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/api/ConfigHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/ConfigHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/ConfigHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/ConnectionHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/api/ConnectionHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/ConnectionHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/ConnectionHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/DITCacheMap.java b/opendj-server-legacy/src/main/java/org/opends/server/api/DITCacheMap.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/DITCacheMap.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/DITCacheMap.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/DirectoryServerMBean.java b/opendj-server-legacy/src/main/java/org/opends/server/api/DirectoryServerMBean.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/DirectoryServerMBean.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/DirectoryServerMBean.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/DirectoryThread.java b/opendj-server-legacy/src/main/java/org/opends/server/api/DirectoryThread.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/DirectoryThread.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/DirectoryThread.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/DiskSpaceMonitorHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/api/DiskSpaceMonitorHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/DiskSpaceMonitorHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/DiskSpaceMonitorHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/EntryCache.java b/opendj-server-legacy/src/main/java/org/opends/server/api/EntryCache.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/EntryCache.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/EntryCache.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/ExportTaskListener.java b/opendj-server-legacy/src/main/java/org/opends/server/api/ExportTaskListener.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/ExportTaskListener.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/ExportTaskListener.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/ExtendedOperationHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/api/ExtendedOperationHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/ExtendedOperationHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/ExtendedOperationHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/Group.java b/opendj-server-legacy/src/main/java/org/opends/server/api/Group.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/Group.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/Group.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/IdentityMapper.java b/opendj-server-legacy/src/main/java/org/opends/server/api/IdentityMapper.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/IdentityMapper.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/IdentityMapper.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/ImportTaskListener.java b/opendj-server-legacy/src/main/java/org/opends/server/api/ImportTaskListener.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/ImportTaskListener.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/ImportTaskListener.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/InitializationCompletedListener.java b/opendj-server-legacy/src/main/java/org/opends/server/api/InitializationCompletedListener.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/InitializationCompletedListener.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/InitializationCompletedListener.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/InvokableComponent.java b/opendj-server-legacy/src/main/java/org/opends/server/api/InvokableComponent.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/InvokableComponent.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/InvokableComponent.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/KeyManagerProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/api/KeyManagerProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/KeyManagerProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/KeyManagerProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/MatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/api/MatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/MatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/MatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/MonitorProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/api/MonitorProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/MonitorProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/MonitorProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/PasswordGenerator.java b/opendj-server-legacy/src/main/java/org/opends/server/api/PasswordGenerator.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/PasswordGenerator.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/PasswordGenerator.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/api/PasswordStorageScheme.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/PasswordStorageScheme.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/PasswordStorageScheme.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/PasswordValidator.java b/opendj-server-legacy/src/main/java/org/opends/server/api/PasswordValidator.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/PasswordValidator.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/PasswordValidator.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/ProtocolElement.java b/opendj-server-legacy/src/main/java/org/opends/server/api/ProtocolElement.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/ProtocolElement.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/ProtocolElement.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/RestoreTaskListener.java b/opendj-server-legacy/src/main/java/org/opends/server/api/RestoreTaskListener.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/RestoreTaskListener.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/RestoreTaskListener.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/SASLMechanismHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/api/SASLMechanismHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/SASLMechanismHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/SASLMechanismHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/ServerShutdownListener.java b/opendj-server-legacy/src/main/java/org/opends/server/api/ServerShutdownListener.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/ServerShutdownListener.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/ServerShutdownListener.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/SubentryChangeListener.java b/opendj-server-legacy/src/main/java/org/opends/server/api/SubentryChangeListener.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/SubentryChangeListener.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/SubentryChangeListener.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/SynchronizationProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/api/SynchronizationProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/SynchronizationProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/SynchronizationProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/TrustManagerProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/api/TrustManagerProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/TrustManagerProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/TrustManagerProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/VirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/api/VirtualAttributeProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/VirtualAttributeProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/VirtualAttributeProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/WorkQueue.java b/opendj-server-legacy/src/main/java/org/opends/server/api/WorkQueue.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/WorkQueue.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/WorkQueue.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/api/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/plugin/DirectoryServerPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/api/plugin/DirectoryServerPlugin.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/plugin/DirectoryServerPlugin.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/plugin/DirectoryServerPlugin.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/plugin/InternalDirectoryServerPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/api/plugin/InternalDirectoryServerPlugin.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/plugin/InternalDirectoryServerPlugin.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/plugin/InternalDirectoryServerPlugin.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/plugin/PluginResult.java b/opendj-server-legacy/src/main/java/org/opends/server/api/plugin/PluginResult.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/plugin/PluginResult.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/plugin/PluginResult.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/plugin/PluginType.java b/opendj-server-legacy/src/main/java/org/opends/server/api/plugin/PluginType.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/plugin/PluginType.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/plugin/PluginType.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/api/plugin/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/api/plugin/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/api/plugin/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/api/plugin/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/Aci.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Aci.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/Aci.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Aci.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/AciBody.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciBody.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/AciBody.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciBody.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/AciContainer.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciContainer.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/AciContainer.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciContainer.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/AciEffectiveRights.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciEffectiveRights.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/AciEffectiveRights.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciEffectiveRights.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/AciEvalContext.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciEvalContext.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/AciEvalContext.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciEvalContext.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/AciException.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/AciException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/AciHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/AciLDAPOperationContainer.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciLDAPOperationContainer.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/AciLDAPOperationContainer.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciLDAPOperationContainer.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/AciList.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciList.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/AciList.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciList.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciListenerManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciListenerManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/AciTargetMatchContext.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargetMatchContext.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/AciTargetMatchContext.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargetMatchContext.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/AciTargets.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargets.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/AciTargets.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargets.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/AuthMethod.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AuthMethod.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/AuthMethod.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AuthMethod.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/BindRule.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/BindRule.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/BindRule.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/BindRule.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/DNS.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/DNS.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/DNS.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/DNS.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/DayOfWeek.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/DayOfWeek.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/DayOfWeek.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/DayOfWeek.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/EnumAccessType.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumAccessType.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/EnumAccessType.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumAccessType.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/EnumAuthMethod.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumAuthMethod.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/EnumAuthMethod.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumAuthMethod.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/EnumBindRuleKeyword.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumBindRuleKeyword.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/EnumBindRuleKeyword.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumBindRuleKeyword.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/EnumBindRuleType.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumBindRuleType.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/EnumBindRuleType.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumBindRuleType.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/EnumBooleanTypes.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumBooleanTypes.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/EnumBooleanTypes.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumBooleanTypes.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/EnumDayOfWeek.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumDayOfWeek.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/EnumDayOfWeek.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumDayOfWeek.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/EnumEvalReason.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumEvalReason.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/EnumEvalReason.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumEvalReason.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/EnumEvalResult.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumEvalResult.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/EnumEvalResult.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumEvalResult.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/EnumRight.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumRight.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/EnumRight.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumRight.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/EnumTargetKeyword.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumTargetKeyword.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/EnumTargetKeyword.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumTargetKeyword.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/EnumTargetOperator.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumTargetOperator.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/EnumTargetOperator.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumTargetOperator.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/EnumUserDNType.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumUserDNType.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/EnumUserDNType.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumUserDNType.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/ExtOp.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/ExtOp.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/ExtOp.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/ExtOp.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/GroupDN.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/GroupDN.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/GroupDN.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/GroupDN.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/IP.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/IP.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/IP.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/IP.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/KeywordBindRule.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/KeywordBindRule.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/KeywordBindRule.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/KeywordBindRule.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/ParentInheritance.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/ParentInheritance.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/ParentInheritance.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/ParentInheritance.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/PatternDN.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternDN.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/PatternDN.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternDN.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/PatternIP.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternIP.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/PatternIP.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternIP.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/PatternRDN.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternRDN.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/PatternRDN.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternRDN.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/PermBindRulePair.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PermBindRulePair.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/PermBindRulePair.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PermBindRulePair.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/Permission.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Permission.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/Permission.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Permission.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/SSF.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/SSF.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/SSF.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/SSF.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/TargAttrFilterList.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargAttrFilterList.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/TargAttrFilterList.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargAttrFilterList.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/TargAttrFilters.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargAttrFilters.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/TargAttrFilters.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargAttrFilters.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/Target.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Target.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/Target.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Target.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/TargetAttr.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargetAttr.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/TargetAttr.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargetAttr.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/TargetControl.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargetControl.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/TargetControl.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargetControl.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/TargetFilter.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargetFilter.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/TargetFilter.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargetFilter.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/TimeOfDay.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TimeOfDay.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/TimeOfDay.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TimeOfDay.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/UserAttr.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserAttr.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/UserAttr.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserAttr.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/UserDN.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserDN.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/UserDN.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserDN.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/UserDNTypeURL.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserDNTypeURL.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/UserDNTypeURL.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserDNTypeURL.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/dseecompat/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/authorization/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/authorization/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/authorization/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/BackupBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/BackupBackend.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/ChangelogBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/ChangelogBackend.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/LDIFBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/LDIFBackend.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/LDIFBackend.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/LDIFBackend.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/MemoryBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/MemoryBackend.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/MemoryBackend.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/MemoryBackend.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/MonitorBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/MonitorBackend.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/NullBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/NullBackend.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/NullBackend.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/NullBackend.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/RebuildConfig.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/RebuildConfig.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/RebuildConfig.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/RebuildConfig.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/RootDSEBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/RootDSEBackend.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/SchemaBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/SchemaBackend.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/TrustStoreBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/TrustStoreBackend.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/TrustStoreBackend.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/TrustStoreBackend.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/VerifyConfig.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/VerifyConfig.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/VerifyConfig.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/VerifyConfig.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/AttributeIndex.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/AttributeIndex.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/AttributeIndex.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/AttributeIndex.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/AttributeIndexer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/AttributeIndexer.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/AttributeIndexer.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/AttributeIndexer.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/BackendImpl.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/BackendImpl.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/BackendImpl.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/BackendImpl.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/BackupManager.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/BackupManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/BackupManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/BackupManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/ConfigurableEnvironment.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ConfigurableEnvironment.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/ConfigurableEnvironment.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ConfigurableEnvironment.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/DN2ID.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/DN2ID.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/DN2ID.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/DN2ID.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/DN2URI.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/DN2URI.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/DN2URI.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/DN2URI.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/DataConfig.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/DataConfig.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/DataConfig.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/DataConfig.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/DatabaseContainer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/DatabaseContainer.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/DatabaseContainer.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/DatabaseContainer.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/DbPreloadComparator.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/DbPreloadComparator.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/DbPreloadComparator.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/DbPreloadComparator.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/EntryCachePreloader.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryCachePreloader.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/EntryCachePreloader.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryCachePreloader.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/EntryContainer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryContainer.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/EntryContainer.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryContainer.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/EntryID.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryID.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/EntryID.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryID.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/EntryIDSet.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryIDSet.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/EntryIDSet.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryIDSet.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/EntryIDSetSorter.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryIDSetSorter.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/EntryIDSetSorter.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryIDSetSorter.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/EnvManager.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EnvManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/EnvManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EnvManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/EqualityIndexer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EqualityIndexer.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/EqualityIndexer.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EqualityIndexer.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/ExportJob.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ExportJob.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/ExportJob.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ExportJob.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/ID2CIndexer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ID2CIndexer.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/ID2CIndexer.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ID2CIndexer.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/ID2Entry.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ID2Entry.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/ID2Entry.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ID2Entry.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/ID2SIndexer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ID2SIndexer.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/ID2SIndexer.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ID2SIndexer.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/IDSetIterator.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IDSetIterator.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/IDSetIterator.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IDSetIterator.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/ImportIDSet.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ImportIDSet.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/ImportIDSet.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ImportIDSet.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/ImportLDIFReader.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ImportLDIFReader.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/ImportLDIFReader.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ImportLDIFReader.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/Importer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Importer.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/Importer.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Importer.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/Index.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Index.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/Index.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Index.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/IndexBuffer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexBuffer.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/IndexBuffer.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexBuffer.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/IndexFilter.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexFilter.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/IndexFilter.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexFilter.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/IndexInputBuffer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexInputBuffer.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/IndexInputBuffer.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexInputBuffer.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/IndexOutputBuffer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexOutputBuffer.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/IndexOutputBuffer.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexOutputBuffer.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/IndexQuery.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexQuery.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/IndexQuery.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexQuery.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/IndexQueryFactoryImpl.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexQueryFactoryImpl.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/IndexQueryFactoryImpl.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexQueryFactoryImpl.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/Indexer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Indexer.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/Indexer.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Indexer.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/JEBUtils.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEBUtils.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/JEBUtils.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEBUtils.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/JECompressedSchema.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JECompressedSchema.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/JECompressedSchema.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JECompressedSchema.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/JebException.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JebException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/JebException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JebException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/JebFormat.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JebFormat.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/JebFormat.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JebFormat.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/NullIndex.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/NullIndex.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/NullIndex.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/NullIndex.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/PresenceIndexer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/PresenceIndexer.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/PresenceIndexer.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/PresenceIndexer.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/RootContainer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/RootContainer.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/RootContainer.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/RootContainer.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/SortValues.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/SortValues.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/SortValues.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/SortValues.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/SortValuesSet.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/SortValuesSet.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/SortValuesSet.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/SortValuesSet.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/State.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/State.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/State.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/State.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/Suffix.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Suffix.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/Suffix.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Suffix.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/VLVIndex.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VLVIndex.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/VLVIndex.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VLVIndex.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/VLVKeyComparator.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VLVKeyComparator.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/VLVKeyComparator.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VLVKeyComparator.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/VerifyJob.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VerifyJob.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/VerifyJob.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VerifyJob.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/jeb/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/jeb/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/persistit/PersistItStorage.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/persistit/PersistItStorage.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/persistit/PersistItStorage.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/persistit/PersistItStorage.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/persistit/PitBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/persistit/PitBackend.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/persistit/PitBackend.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/persistit/PitBackend.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/persistit/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/persistit/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/persistit/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/persistit/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/AttributeIndex.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/AttributeIndex.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/AttributeIndex.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/AttributeIndex.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/AttributeIndexer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/AttributeIndexer.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/AttributeIndexer.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/AttributeIndexer.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/BackendImpl.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/BackendImpl.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/BackupManager.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackupManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/BackupManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackupManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/DN2ID.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2ID.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/DN2ID.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2ID.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/DN2URI.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2URI.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/DN2URI.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2URI.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/DataConfig.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DataConfig.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/DataConfig.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DataConfig.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/DatabaseContainer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DatabaseContainer.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/DatabaseContainer.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DatabaseContainer.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/DatabaseEnvironmentMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DatabaseEnvironmentMonitor.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/DatabaseEnvironmentMonitor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DatabaseEnvironmentMonitor.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/DbPreloadComparator.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DbPreloadComparator.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/DbPreloadComparator.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DbPreloadComparator.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/EntryCachePreloader.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryCachePreloader.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/EntryCachePreloader.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryCachePreloader.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/EntryContainer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/EntryContainer.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/EntryID.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryID.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/EntryID.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryID.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/EntryIDSet.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryIDSet.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/EntryIDSet.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryIDSet.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/EntryIDSetSorter.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryIDSetSorter.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/EntryIDSetSorter.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryIDSetSorter.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/EqualityIndexer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EqualityIndexer.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/EqualityIndexer.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EqualityIndexer.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/ExportJob.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ExportJob.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/ExportJob.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ExportJob.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/ID2CIndexer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2CIndexer.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/ID2CIndexer.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2CIndexer.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/ID2Entry.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2Entry.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/ID2Entry.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2Entry.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/ID2SIndexer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2SIndexer.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/ID2SIndexer.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2SIndexer.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/IDSetIterator.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IDSetIterator.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/IDSetIterator.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IDSetIterator.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/ImportIDSet.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ImportIDSet.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/ImportIDSet.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ImportIDSet.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/ImportLDIFReader.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ImportLDIFReader.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/ImportLDIFReader.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ImportLDIFReader.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/Importer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Importer.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/Importer.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Importer.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/Index.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Index.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/Index.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Index.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/IndexBuffer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexBuffer.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/IndexBuffer.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexBuffer.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/IndexFilter.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexFilter.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/IndexFilter.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexFilter.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/IndexInputBuffer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexInputBuffer.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/IndexInputBuffer.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexInputBuffer.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/IndexOutputBuffer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexOutputBuffer.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/IndexOutputBuffer.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexOutputBuffer.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/IndexQuery.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexQuery.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/IndexQuery.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexQuery.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/IndexQueryFactoryImpl.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexQueryFactoryImpl.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/IndexQueryFactoryImpl.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexQueryFactoryImpl.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/Indexer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Indexer.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/Indexer.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Indexer.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/JECompressedSchema.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/JECompressedSchema.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/JECompressedSchema.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/JECompressedSchema.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/JebFormat.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/JebFormat.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/JebFormat.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/JebFormat.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/NullIndex.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/NullIndex.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/NullIndex.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/NullIndex.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/PresenceIndexer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/PresenceIndexer.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/PresenceIndexer.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/PresenceIndexer.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/RootContainer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/RootContainer.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/RootContainer.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/RootContainer.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/SortValues.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/SortValues.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/SortValues.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/SortValues.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/SortValuesSet.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/SortValuesSet.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/SortValuesSet.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/SortValuesSet.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/State.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/State.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/State.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/State.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/Suffix.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Suffix.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/Suffix.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Suffix.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/SuffixContainer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/SuffixContainer.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/SuffixContainer.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/SuffixContainer.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/VLVIndex.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VLVIndex.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/VLVIndex.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VLVIndex.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/VerifyJob.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VerifyJob.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/VerifyJob.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VerifyJob.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/spi/Cursor.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/Cursor.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/spi/Cursor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/Cursor.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/spi/Importer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/Importer.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/spi/Importer.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/Importer.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/spi/ReadOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/ReadOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/spi/ReadOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/ReadOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/spi/ReadableStorage.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/ReadableStorage.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/spi/ReadableStorage.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/ReadableStorage.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/spi/Storage.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/Storage.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/spi/Storage.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/Storage.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/spi/StorageRuntimeException.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/StorageRuntimeException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/spi/StorageRuntimeException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/StorageRuntimeException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/spi/TreeName.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/TreeName.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/spi/TreeName.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/TreeName.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/spi/UpdateFunction.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/UpdateFunction.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/spi/UpdateFunction.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/UpdateFunction.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/spi/WriteOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/WriteOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/spi/WriteOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/WriteOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/spi/WriteableStorage.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/WriteableStorage.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/spi/WriteableStorage.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/WriteableStorage.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/pluggable/spi/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/pluggable/spi/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/task/FailedDependencyAction.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/task/FailedDependencyAction.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/task/FailedDependencyAction.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/task/FailedDependencyAction.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/task/RecurringTask.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/task/RecurringTask.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/task/RecurringTask.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/task/RecurringTask.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/task/Task.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/task/Task.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/task/Task.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/task/Task.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/task/TaskBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskBackend.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/task/TaskBackend.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskBackend.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/task/TaskScheduler.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskScheduler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/task/TaskScheduler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskScheduler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/task/TaskState.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskState.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/task/TaskState.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskState.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/task/TaskThread.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskThread.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/task/TaskThread.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskThread.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/backends/task/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/task/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/backends/task/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/backends/task/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/config/BooleanConfigAttribute.java b/opendj-server-legacy/src/main/java/org/opends/server/config/BooleanConfigAttribute.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/config/BooleanConfigAttribute.java
rename to opendj-server-legacy/src/main/java/org/opends/server/config/BooleanConfigAttribute.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/config/ConfigAttribute.java b/opendj-server-legacy/src/main/java/org/opends/server/config/ConfigAttribute.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/config/ConfigAttribute.java
rename to opendj-server-legacy/src/main/java/org/opends/server/config/ConfigAttribute.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/config/ConfigConstants.java b/opendj-server-legacy/src/main/java/org/opends/server/config/ConfigConstants.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/config/ConfigConstants.java
rename to opendj-server-legacy/src/main/java/org/opends/server/config/ConfigConstants.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/config/ConfigEntry.java b/opendj-server-legacy/src/main/java/org/opends/server/config/ConfigEntry.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/config/ConfigEntry.java
rename to opendj-server-legacy/src/main/java/org/opends/server/config/ConfigEntry.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/config/ConfigException.java b/opendj-server-legacy/src/main/java/org/opends/server/config/ConfigException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/config/ConfigException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/config/ConfigException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/config/DNConfigAttribute.java b/opendj-server-legacy/src/main/java/org/opends/server/config/DNConfigAttribute.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/config/DNConfigAttribute.java
rename to opendj-server-legacy/src/main/java/org/opends/server/config/DNConfigAttribute.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/config/IntegerConfigAttribute.java b/opendj-server-legacy/src/main/java/org/opends/server/config/IntegerConfigAttribute.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/config/IntegerConfigAttribute.java
rename to opendj-server-legacy/src/main/java/org/opends/server/config/IntegerConfigAttribute.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/config/IntegerWithUnitConfigAttribute.java b/opendj-server-legacy/src/main/java/org/opends/server/config/IntegerWithUnitConfigAttribute.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/config/IntegerWithUnitConfigAttribute.java
rename to opendj-server-legacy/src/main/java/org/opends/server/config/IntegerWithUnitConfigAttribute.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/config/JMXMBean.java b/opendj-server-legacy/src/main/java/org/opends/server/config/JMXMBean.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/config/JMXMBean.java
rename to opendj-server-legacy/src/main/java/org/opends/server/config/JMXMBean.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/config/MultiChoiceConfigAttribute.java b/opendj-server-legacy/src/main/java/org/opends/server/config/MultiChoiceConfigAttribute.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/config/MultiChoiceConfigAttribute.java
rename to opendj-server-legacy/src/main/java/org/opends/server/config/MultiChoiceConfigAttribute.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/config/ReadOnlyConfigAttribute.java b/opendj-server-legacy/src/main/java/org/opends/server/config/ReadOnlyConfigAttribute.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/config/ReadOnlyConfigAttribute.java
rename to opendj-server-legacy/src/main/java/org/opends/server/config/ReadOnlyConfigAttribute.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/config/StringConfigAttribute.java b/opendj-server-legacy/src/main/java/org/opends/server/config/StringConfigAttribute.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/config/StringConfigAttribute.java
rename to opendj-server-legacy/src/main/java/org/opends/server/config/StringConfigAttribute.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/config/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/config/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/config/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/config/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/controls/AccountUsableRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/AccountUsableRequestControl.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/controls/AccountUsableRequestControl.java
rename to opendj-server-legacy/src/main/java/org/opends/server/controls/AccountUsableRequestControl.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/controls/AccountUsableResponseControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/AccountUsableResponseControl.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/controls/AccountUsableResponseControl.java
rename to opendj-server-legacy/src/main/java/org/opends/server/controls/AccountUsableResponseControl.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/controls/AuthorizationIdentityResponseControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/AuthorizationIdentityResponseControl.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/controls/AuthorizationIdentityResponseControl.java
rename to opendj-server-legacy/src/main/java/org/opends/server/controls/AuthorizationIdentityResponseControl.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/controls/ControlDecoder.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/ControlDecoder.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/controls/ControlDecoder.java
rename to opendj-server-legacy/src/main/java/org/opends/server/controls/ControlDecoder.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/controls/EntryChangeNotificationControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangeNotificationControl.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/controls/EntryChangeNotificationControl.java
rename to opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangeNotificationControl.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/controls/EntryChangelogNotificationControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangelogNotificationControl.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/controls/EntryChangelogNotificationControl.java
rename to opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangelogNotificationControl.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/controls/ExternalChangelogRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/ExternalChangelogRequestControl.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/controls/ExternalChangelogRequestControl.java
rename to opendj-server-legacy/src/main/java/org/opends/server/controls/ExternalChangelogRequestControl.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/controls/GetEffectiveRightsRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/GetEffectiveRightsRequestControl.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/controls/GetEffectiveRightsRequestControl.java
rename to opendj-server-legacy/src/main/java/org/opends/server/controls/GetEffectiveRightsRequestControl.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/controls/LDAPAssertionRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPAssertionRequestControl.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/controls/LDAPAssertionRequestControl.java
rename to opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPAssertionRequestControl.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/controls/LDAPPostReadRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadRequestControl.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/controls/LDAPPostReadRequestControl.java
rename to opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadRequestControl.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/controls/LDAPPostReadResponseControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadResponseControl.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/controls/LDAPPostReadResponseControl.java
rename to opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadResponseControl.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/controls/LDAPPreReadRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadRequestControl.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/controls/LDAPPreReadRequestControl.java
rename to opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadRequestControl.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/controls/LDAPPreReadResponseControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadResponseControl.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/controls/LDAPPreReadResponseControl.java
rename to opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadResponseControl.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/controls/MatchedValuesControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/MatchedValuesControl.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/controls/MatchedValuesControl.java
rename to opendj-server-legacy/src/main/java/org/opends/server/controls/MatchedValuesControl.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/controls/MatchedValuesFilter.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/MatchedValuesFilter.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/controls/MatchedValuesFilter.java
rename to opendj-server-legacy/src/main/java/org/opends/server/controls/MatchedValuesFilter.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/controls/PagedResultsControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/PagedResultsControl.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/controls/PagedResultsControl.java
rename to opendj-server-legacy/src/main/java/org/opends/server/controls/PagedResultsControl.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/controls/PasswordExpiredControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordExpiredControl.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/controls/PasswordExpiredControl.java
rename to opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordExpiredControl.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/controls/PasswordExpiringControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordExpiringControl.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/controls/PasswordExpiringControl.java
rename to opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordExpiringControl.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/controls/PasswordPolicyErrorType.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyErrorType.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/controls/PasswordPolicyErrorType.java
rename to opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyErrorType.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/controls/PasswordPolicyRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyRequestControl.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/controls/PasswordPolicyRequestControl.java
rename to opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyRequestControl.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/controls/PasswordPolicyResponseControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyResponseControl.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/controls/PasswordPolicyResponseControl.java
rename to opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyResponseControl.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/controls/PasswordPolicyWarningType.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyWarningType.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/controls/PasswordPolicyWarningType.java
rename to opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyWarningType.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/controls/PersistentSearchChangeType.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/PersistentSearchChangeType.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/controls/PersistentSearchChangeType.java
rename to opendj-server-legacy/src/main/java/org/opends/server/controls/PersistentSearchChangeType.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/controls/PersistentSearchControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/PersistentSearchControl.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/controls/PersistentSearchControl.java
rename to opendj-server-legacy/src/main/java/org/opends/server/controls/PersistentSearchControl.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/controls/ProxiedAuthV1Control.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV1Control.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/controls/ProxiedAuthV1Control.java
rename to opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV1Control.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/controls/ProxiedAuthV2Control.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV2Control.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/controls/ProxiedAuthV2Control.java
rename to opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV2Control.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/controls/ServerSideSortRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortRequestControl.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/controls/ServerSideSortRequestControl.java
rename to opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortRequestControl.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/controls/ServerSideSortResponseControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortResponseControl.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/controls/ServerSideSortResponseControl.java
rename to opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortResponseControl.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/controls/SubentriesControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/SubentriesControl.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/controls/SubentriesControl.java
rename to opendj-server-legacy/src/main/java/org/opends/server/controls/SubentriesControl.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/controls/SubtreeDeleteControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/SubtreeDeleteControl.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/controls/SubtreeDeleteControl.java
rename to opendj-server-legacy/src/main/java/org/opends/server/controls/SubtreeDeleteControl.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/controls/VLVRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/VLVRequestControl.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/controls/VLVRequestControl.java
rename to opendj-server-legacy/src/main/java/org/opends/server/controls/VLVRequestControl.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/controls/VLVResponseControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/VLVResponseControl.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/controls/VLVResponseControl.java
rename to opendj-server-legacy/src/main/java/org/opends/server/controls/VLVResponseControl.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/controls/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/controls/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/controls/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/AbandonOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AbandonOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/AbandonOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/AbandonOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/AbandonOperationBasis.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AbandonOperationBasis.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/AbandonOperationBasis.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/AbandonOperationBasis.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/AbandonOperationWrapper.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AbandonOperationWrapper.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/AbandonOperationWrapper.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/AbandonOperationWrapper.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/AccessControlConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AccessControlConfigManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/AccessControlConfigManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/AccessControlConfigManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/AddOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AddOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/AddOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/AddOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/AddOperationBasis.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AddOperationBasis.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/AddOperationBasis.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/AddOperationBasis.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/AddOperationWrapper.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AddOperationWrapper.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/AddOperationWrapper.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/AddOperationWrapper.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/AlertHandlerConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AlertHandlerConfigManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/AlertHandlerConfigManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/AlertHandlerConfigManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/AttributeSyntaxConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AttributeSyntaxConfigManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/AttributeSyntaxConfigManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/AttributeSyntaxConfigManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/AuthenticatedUsers.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AuthenticatedUsers.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/AuthenticatedUsers.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/AuthenticatedUsers.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/BackendConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/BackendConfigManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/BackendConfigManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/BackendConfigManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/BaseDnRegistry.java b/opendj-server-legacy/src/main/java/org/opends/server/core/BaseDnRegistry.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/BaseDnRegistry.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/BaseDnRegistry.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/BindOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/core/BindOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/BindOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/BindOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/BindOperationBasis.java b/opendj-server-legacy/src/main/java/org/opends/server/core/BindOperationBasis.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/BindOperationBasis.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/BindOperationBasis.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/BindOperationWrapper.java b/opendj-server-legacy/src/main/java/org/opends/server/core/BindOperationWrapper.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/BindOperationWrapper.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/BindOperationWrapper.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/BoundedWorkQueueStrategy.java b/opendj-server-legacy/src/main/java/org/opends/server/core/BoundedWorkQueueStrategy.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/BoundedWorkQueueStrategy.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/BoundedWorkQueueStrategy.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/CertificateMapperConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/CertificateMapperConfigManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/CertificateMapperConfigManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/CertificateMapperConfigManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/CompareOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/core/CompareOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/CompareOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/CompareOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/CompareOperationBasis.java b/opendj-server-legacy/src/main/java/org/opends/server/core/CompareOperationBasis.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/CompareOperationBasis.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/CompareOperationBasis.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/CompareOperationWrapper.java b/opendj-server-legacy/src/main/java/org/opends/server/core/CompareOperationWrapper.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/CompareOperationWrapper.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/CompareOperationWrapper.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/ConfigurationBootstrapper.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ConfigurationBootstrapper.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/ConfigurationBootstrapper.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/ConfigurationBootstrapper.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/ConfigurationHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ConfigurationHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/ConfigurationHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/ConfigurationHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ConnectionHandlerConfigManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/ConnectionHandlerConfigManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/CoreConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/CoreConfigManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/CoreConfigManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/CoreConfigManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/CoreConstants.java b/opendj-server-legacy/src/main/java/org/opends/server/core/CoreConstants.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/CoreConstants.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/CoreConstants.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/DefaultAccessControlHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/core/DefaultAccessControlHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/DefaultAccessControlHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/DefaultAccessControlHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/DefaultCompressedSchema.java b/opendj-server-legacy/src/main/java/org/opends/server/core/DefaultCompressedSchema.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/DefaultCompressedSchema.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/DefaultCompressedSchema.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/DeleteOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/core/DeleteOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/DeleteOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/DeleteOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/DeleteOperationBasis.java b/opendj-server-legacy/src/main/java/org/opends/server/core/DeleteOperationBasis.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/DeleteOperationBasis.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/DeleteOperationBasis.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/DeleteOperationWrapper.java b/opendj-server-legacy/src/main/java/org/opends/server/core/DeleteOperationWrapper.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/DeleteOperationWrapper.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/DeleteOperationWrapper.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/DirectoryServer.java b/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/DirectoryServer.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/DirectoryServerShutdownHook.java b/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServerShutdownHook.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/DirectoryServerShutdownHook.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServerShutdownHook.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/EntryCacheConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/EntryCacheConfigManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/EntryCacheConfigManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/EntryCacheConfigManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/ExtendedOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/ExtendedOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/ExtendedOperationBasis.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationBasis.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/ExtendedOperationBasis.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationBasis.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/ExtendedOperationConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationConfigManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/ExtendedOperationConfigManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationConfigManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/ExtendedOperationWrapper.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationWrapper.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/ExtendedOperationWrapper.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationWrapper.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/GroupManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/GroupManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/GroupManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/GroupManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/IdentityMapperConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/IdentityMapperConfigManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/IdentityMapperConfigManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/IdentityMapperConfigManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/IdleTimeLimitThread.java b/opendj-server-legacy/src/main/java/org/opends/server/core/IdleTimeLimitThread.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/IdleTimeLimitThread.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/IdleTimeLimitThread.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/KeyManagerProviderConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/KeyManagerProviderConfigManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/KeyManagerProviderConfigManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/KeyManagerProviderConfigManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/LockFileManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/LockFileManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/LockFileManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/LockFileManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/LogRetentionPolicyConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/LogRetentionPolicyConfigManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/LogRetentionPolicyConfigManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/LogRetentionPolicyConfigManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/LogRotationPolicyConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/LogRotationPolicyConfigManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/LogRotationPolicyConfigManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/LogRotationPolicyConfigManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/LoggerConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/LoggerConfigManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/LoggerConfigManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/LoggerConfigManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/MatchingRuleConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/MatchingRuleConfigManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/MatchingRuleConfigManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/MatchingRuleConfigManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/ModifyDNOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ModifyDNOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/ModifyDNOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/ModifyDNOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/ModifyDNOperationBasis.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ModifyDNOperationBasis.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/ModifyDNOperationBasis.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/ModifyDNOperationBasis.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/ModifyDNOperationWrapper.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ModifyDNOperationWrapper.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/ModifyDNOperationWrapper.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/ModifyDNOperationWrapper.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/ModifyOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ModifyOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/ModifyOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/ModifyOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/ModifyOperationBasis.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ModifyOperationBasis.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/ModifyOperationBasis.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/ModifyOperationBasis.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/ModifyOperationWrapper.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ModifyOperationWrapper.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/ModifyOperationWrapper.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/ModifyOperationWrapper.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/MonitorConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/MonitorConfigManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/MonitorConfigManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/MonitorConfigManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/OperationWrapper.java b/opendj-server-legacy/src/main/java/org/opends/server/core/OperationWrapper.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/OperationWrapper.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/OperationWrapper.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/PasswordGeneratorConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordGeneratorConfigManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/PasswordGeneratorConfigManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/PasswordGeneratorConfigManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/PasswordPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicy.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/PasswordPolicy.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicy.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/PasswordPolicyConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyConfigManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/PasswordPolicyConfigManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyConfigManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/PasswordPolicyFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/PasswordPolicyFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/PasswordPolicyState.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyState.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/PasswordPolicyState.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyState.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/PasswordStorageSchemeConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordStorageSchemeConfigManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/PasswordStorageSchemeConfigManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/PasswordStorageSchemeConfigManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/PasswordValidatorConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordValidatorConfigManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/PasswordValidatorConfigManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/PasswordValidatorConfigManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/PersistentSearch.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PersistentSearch.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/PersistentSearch.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/PersistentSearch.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/PluginConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PluginConfigManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/PluginConfigManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/PluginConfigManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/QueueingStrategy.java b/opendj-server-legacy/src/main/java/org/opends/server/core/QueueingStrategy.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/QueueingStrategy.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/QueueingStrategy.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/RootDNConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/RootDNConfigManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/RootDNConfigManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/RootDNConfigManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/RootPrivilegeChangeListener.java b/opendj-server-legacy/src/main/java/org/opends/server/core/RootPrivilegeChangeListener.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/RootPrivilegeChangeListener.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/RootPrivilegeChangeListener.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/SASLConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/SASLConfigManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/SASLConfigManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/SASLConfigManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/SchemaConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/SchemaConfigManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/SchemaConfigManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/SchemaConfigManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/SchemaHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/core/SchemaHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/SchemaHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/SchemaHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/SearchOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/core/SearchOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/SearchOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/SearchOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/SearchOperationBasis.java b/opendj-server-legacy/src/main/java/org/opends/server/core/SearchOperationBasis.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/SearchOperationBasis.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/SearchOperationBasis.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/SearchOperationWrapper.java b/opendj-server-legacy/src/main/java/org/opends/server/core/SearchOperationWrapper.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/SearchOperationWrapper.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/SearchOperationWrapper.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/ServerContext.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ServerContext.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/ServerContext.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/ServerContext.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/ServerShutdownMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ServerShutdownMonitor.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/ServerShutdownMonitor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/ServerShutdownMonitor.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/SubentryManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/SubentryManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/SubentryManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/SubentryManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/SubentryPasswordPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/core/SubentryPasswordPolicy.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/SubentryPasswordPolicy.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/SubentryPasswordPolicy.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/SynchronizationProviderConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/SynchronizationProviderConfigManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/SynchronizationProviderConfigManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/SynchronizationProviderConfigManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/SynchronousStrategy.java b/opendj-server-legacy/src/main/java/org/opends/server/core/SynchronousStrategy.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/SynchronousStrategy.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/SynchronousStrategy.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/TrustManagerProviderConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/TrustManagerProviderConfigManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/TrustManagerProviderConfigManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/TrustManagerProviderConfigManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/UnbindOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/core/UnbindOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/UnbindOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/UnbindOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/UnbindOperationBasis.java b/opendj-server-legacy/src/main/java/org/opends/server/core/UnbindOperationBasis.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/UnbindOperationBasis.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/UnbindOperationBasis.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/UnbindOperationWrapper.java b/opendj-server-legacy/src/main/java/org/opends/server/core/UnbindOperationWrapper.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/UnbindOperationWrapper.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/UnbindOperationWrapper.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/VirtualAttributeConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/VirtualAttributeConfigManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/VirtualAttributeConfigManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/VirtualAttributeConfigManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/WorkQueueConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/WorkQueueConfigManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/WorkQueueConfigManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/WorkQueueConfigManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/WorkQueueStrategy.java b/opendj-server-legacy/src/main/java/org/opends/server/core/WorkQueueStrategy.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/WorkQueueStrategy.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/WorkQueueStrategy.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/core/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/core/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/core/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/core/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/crypto/CryptoManagerImpl.java b/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/crypto/CryptoManagerImpl.java
rename to opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/crypto/CryptoManagerSync.java b/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerSync.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/crypto/CryptoManagerSync.java
rename to opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerSync.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/crypto/GetSymmetricKeyExtendedOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/crypto/GetSymmetricKeyExtendedOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/crypto/GetSymmetricKeyExtendedOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/crypto/GetSymmetricKeyExtendedOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/crypto/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/crypto/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/crypto/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/crypto/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/AESPasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/AESPasswordStorageScheme.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/AESPasswordStorageScheme.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/AESPasswordStorageScheme.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/AnonymousSASLMechanismHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/AnonymousSASLMechanismHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/AttributeValuePasswordValidator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/AttributeValuePasswordValidator.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/AttributeValuePasswordValidator.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/AttributeValuePasswordValidator.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/Base64PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/Base64PasswordStorageScheme.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/Base64PasswordStorageScheme.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/Base64PasswordStorageScheme.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/BlindTrustManagerProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/BlindTrustManagerProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/BlindTrustManagerProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/BlindTrustManagerProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/BlowfishPasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/BlowfishPasswordStorageScheme.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/BlowfishPasswordStorageScheme.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/BlowfishPasswordStorageScheme.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/CancelExtendedOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CancelExtendedOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/CancelExtendedOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/CancelExtendedOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/CertificateValidationPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CertificateValidationPolicy.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/CertificateValidationPolicy.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/CertificateValidationPolicy.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/CharacterSetPasswordValidator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CharacterSetPasswordValidator.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/CharacterSetPasswordValidator.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/CharacterSetPasswordValidator.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/ClearPasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ClearPasswordStorageScheme.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/ClearPasswordStorageScheme.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/ClearPasswordStorageScheme.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/CollectiveAttributeSubentriesVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CollectiveAttributeSubentriesVirtualAttributeProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/CollectiveAttributeSubentriesVirtualAttributeProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/CollectiveAttributeSubentriesVirtualAttributeProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/ConfigFileHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ConfigFileHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/ConfigFileHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/ConfigFileHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/ConnectionSecurityProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ConnectionSecurityProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/ConnectionSecurityProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/ConnectionSecurityProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/CryptPasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CryptPasswordStorageScheme.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/CryptPasswordStorageScheme.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/CryptPasswordStorageScheme.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/DefaultEntryCache.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DefaultEntryCache.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/DefaultEntryCache.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/DefaultEntryCache.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/DictionaryPasswordValidator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DictionaryPasswordValidator.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/DictionaryPasswordValidator.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/DictionaryPasswordValidator.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/DiskSpaceMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DiskSpaceMonitor.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/DiskSpaceMonitor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/DiskSpaceMonitor.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/DynamicGroup.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroup.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/DynamicGroup.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroup.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/DynamicGroupMemberList.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroupMemberList.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/DynamicGroupMemberList.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroupMemberList.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/DynamicGroupSearchThread.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroupSearchThread.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/DynamicGroupSearchThread.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroupSearchThread.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/EntityTagVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntityTagVirtualAttributeProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/EntityTagVirtualAttributeProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/EntityTagVirtualAttributeProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/EntryCacheCommon.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryCacheCommon.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/EntryCacheCommon.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryCacheCommon.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/ExactMatchIdentityMapper.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExactMatchIdentityMapper.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/ExactMatchIdentityMapper.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/ExactMatchIdentityMapper.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/ExtensionsConstants.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExtensionsConstants.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/ExtensionsConstants.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/ExtensionsConstants.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExternalSASLMechanismHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/ExternalSASLMechanismHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/FIFOEntryCache.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FIFOEntryCache.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/FIFOEntryCache.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/FIFOEntryCache.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedKeyManagerProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedKeyManagerProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/FileBasedTrustManagerProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedTrustManagerProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/FileBasedTrustManagerProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedTrustManagerProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/FilteredStaticGroupMemberList.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FilteredStaticGroupMemberList.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/FilteredStaticGroupMemberList.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/FilteredStaticGroupMemberList.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FingerprintCertificateMapper.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/FingerprintCertificateMapper.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/GetConnectionIDExtendedOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/GetConnectionIDExtendedOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/GetConnectionIDExtendedOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/GetConnectionIDExtendedOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/JMXAlertHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/JMXAlertHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/JMXAlertHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/JMXAlertHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/LengthBasedPasswordValidator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/LengthBasedPasswordValidator.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/LengthBasedPasswordValidator.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/LengthBasedPasswordValidator.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/MD5PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/MD5PasswordStorageScheme.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/MD5PasswordStorageScheme.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/MD5PasswordStorageScheme.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/MemberVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/MemberVirtualAttributeProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/MemberVirtualAttributeProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/MemberVirtualAttributeProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/NotificationMessageNotificationMessageTemplateElement.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationMessageNotificationMessageTemplateElement.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/NotificationMessageNotificationMessageTemplateElement.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationMessageNotificationMessageTemplateElement.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/NotificationMessageTemplateElement.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationMessageTemplateElement.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/NotificationMessageTemplateElement.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationMessageTemplateElement.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/NotificationPropertyNotificationMessageTemplateElement.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationPropertyNotificationMessageTemplateElement.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/NotificationPropertyNotificationMessageTemplateElement.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationPropertyNotificationMessageTemplateElement.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/NotificationTypeNotificationMessageTemplateElement.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationTypeNotificationMessageTemplateElement.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/NotificationTypeNotificationMessageTemplateElement.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationTypeNotificationMessageTemplateElement.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/NullKeyManagerProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/NullKeyManagerProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/NullKeyManagerProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/NullKeyManagerProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/NullTrustManagerProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/NullTrustManagerProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/NullTrustManagerProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/NullTrustManagerProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS11KeyManagerProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS11KeyManagerProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/PKCS5S2PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS5S2PasswordStorageScheme.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/PKCS5S2PasswordStorageScheme.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS5S2PasswordStorageScheme.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/ParallelWorkQueue.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ParallelWorkQueue.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/ParallelWorkQueue.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/ParallelWorkQueue.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/ParallelWorkerThread.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ParallelWorkerThread.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/ParallelWorkerThread.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/ParallelWorkerThread.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordModifyExtendedOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordModifyExtendedOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/PasswordPolicyStateExtendedOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordPolicyStateExtendedOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/PasswordPolicyStateExtendedOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordPolicyStateExtendedOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/PlainSASLMechanismHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PlainSASLMechanismHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/PlainSASLMechanismHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/PlainSASLMechanismHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/RC4PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RC4PasswordStorageScheme.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/RC4PasswordStorageScheme.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/RC4PasswordStorageScheme.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/RandomPasswordGenerator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RandomPasswordGenerator.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/RandomPasswordGenerator.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/RandomPasswordGenerator.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/RedirectingByteChannel.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RedirectingByteChannel.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/RedirectingByteChannel.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/RedirectingByteChannel.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/RegularExpressionIdentityMapper.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RegularExpressionIdentityMapper.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/RegularExpressionIdentityMapper.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/RegularExpressionIdentityMapper.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/RepeatedCharactersPasswordValidator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RepeatedCharactersPasswordValidator.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/RepeatedCharactersPasswordValidator.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/RepeatedCharactersPasswordValidator.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/SASLByteChannel.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SASLByteChannel.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/SASLByteChannel.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/SASLByteChannel.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/SASLContext.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SASLContext.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/SASLContext.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/SASLContext.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/SHA1PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SHA1PasswordStorageScheme.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/SHA1PasswordStorageScheme.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/SHA1PasswordStorageScheme.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/SMTPAlertHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SMTPAlertHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/SMTPAlertHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/SMTPAlertHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/Sha2Crypt.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/Sha2Crypt.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/Sha2Crypt.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/Sha2Crypt.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/SimilarityBasedPasswordValidator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SimilarityBasedPasswordValidator.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/SimilarityBasedPasswordValidator.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/SimilarityBasedPasswordValidator.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/SimpleStaticGroupMemberList.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SimpleStaticGroupMemberList.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/SimpleStaticGroupMemberList.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/SimpleStaticGroupMemberList.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SoftReferenceEntryCache.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/SoftReferenceEntryCache.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/StartTLSExtendedOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/StartTLSExtendedOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/StartTLSExtendedOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/StartTLSExtendedOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/StaticGroup.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/StaticGroup.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/StaticGroup.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/StaticGroup.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/SubjectEqualsDNCertificateMapper.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectEqualsDNCertificateMapper.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/SubjectEqualsDNCertificateMapper.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectEqualsDNCertificateMapper.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/TLSByteChannel.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/TLSByteChannel.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/TLSByteChannel.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/TLSByteChannel.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/TLSCapableConnection.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/TLSCapableConnection.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/TLSCapableConnection.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/TLSCapableConnection.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/TextNotificationMessageTemplateElement.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/TextNotificationMessageTemplateElement.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/TextNotificationMessageTemplateElement.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/TextNotificationMessageTemplateElement.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/TraditionalWorkQueue.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/TraditionalWorkQueue.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/TraditionalWorkQueue.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/TraditionalWorkQueue.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/TraditionalWorkerThread.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/TraditionalWorkerThread.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/TraditionalWorkerThread.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/TraditionalWorkerThread.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/TripleDESPasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/TripleDESPasswordStorageScheme.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/TripleDESPasswordStorageScheme.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/TripleDESPasswordStorageScheme.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/UniqueCharactersPasswordValidator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/UniqueCharactersPasswordValidator.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/UniqueCharactersPasswordValidator.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/UniqueCharactersPasswordValidator.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/UserAttributeNotificationMessageTemplateElement.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserAttributeNotificationMessageTemplateElement.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/UserAttributeNotificationMessageTemplateElement.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/UserAttributeNotificationMessageTemplateElement.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/UserDNNotificationMessageTemplateElement.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDNNotificationMessageTemplateElement.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/UserDNNotificationMessageTemplateElement.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDNNotificationMessageTemplateElement.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/VirtualStaticGroup.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/VirtualStaticGroup.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/VirtualStaticGroup.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/VirtualStaticGroup.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/WhoAmIExtendedOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/WhoAmIExtendedOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/WhoAmIExtendedOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/WhoAmIExtendedOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/extensions/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/extensions/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/extensions/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/AbstractLogger.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractLogger.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/AbstractLogger.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractLogger.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractTextAccessLogPublisher.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisher.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractTextAccessLogPublisher.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/AccessLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/AccessLogPublisher.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/AccessLogPublisher.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/AccessLogPublisher.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/AccessLogger.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/AccessLogger.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/AccessLogger.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/AccessLogger.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/ActionType.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ActionType.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/ActionType.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/ActionType.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/AsynchronousTextWriter.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/AsynchronousTextWriter.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/AsynchronousTextWriter.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/AsynchronousTextWriter.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/ConsoleDebugLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ConsoleDebugLogPublisher.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/ConsoleDebugLogPublisher.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/ConsoleDebugLogPublisher.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/DebugLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugLogPublisher.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/DebugLogPublisher.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugLogPublisher.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/DebugLogger.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugLogger.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/DebugLogger.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugLogger.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/DebugMessageFormatter.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugMessageFormatter.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/DebugMessageFormatter.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugMessageFormatter.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/DebugStackTraceFormatter.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugStackTraceFormatter.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/DebugStackTraceFormatter.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugStackTraceFormatter.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/DebugTracer.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugTracer.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/DebugTracer.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugTracer.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/EncryptAction.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/EncryptAction.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/EncryptAction.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/EncryptAction.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/ErrorLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ErrorLogPublisher.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/ErrorLogPublisher.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/ErrorLogPublisher.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/ErrorLogger.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ErrorLogger.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/ErrorLogger.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/ErrorLogger.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/FileComparator.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/FileComparator.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/FileComparator.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/FileComparator.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/FileNamingPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/FileNamingPolicy.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/FileNamingPolicy.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/FileNamingPolicy.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/FileNumberRetentionPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/FileNumberRetentionPolicy.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/FileNumberRetentionPolicy.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/FileNumberRetentionPolicy.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/FixedTimeRotationPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/FixedTimeRotationPolicy.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/FixedTimeRotationPolicy.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/FixedTimeRotationPolicy.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/GZIPAction.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/GZIPAction.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/GZIPAction.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/GZIPAction.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/HTTPAccessLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/HTTPAccessLogPublisher.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/HTTPAccessLogPublisher.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/HTTPAccessLogPublisher.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/HTTPAccessLogger.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/HTTPAccessLogger.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/HTTPAccessLogger.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/HTTPAccessLogger.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/HTTPRequestInfo.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/HTTPRequestInfo.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/HTTPRequestInfo.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/HTTPRequestInfo.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/JDKLogging.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/JDKLogging.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/JDKLogging.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/JDKLogging.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/JDKLoggingFormater.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/JDKLoggingFormater.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/JDKLoggingFormater.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/JDKLoggingFormater.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/LogFileFilter.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/LogFileFilter.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/LogFileFilter.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/LogFileFilter.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/LogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/LogPublisher.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/LogPublisher.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/LogPublisher.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/LogPublisherErrorHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/LogPublisherErrorHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/LogPublisherErrorHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/LogPublisherErrorHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/LoggerAlarmHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/LoggerAlarmHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/LoggerAlarmHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/LoggerAlarmHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/LoggingCategoryNames.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/LoggingCategoryNames.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/LoggingCategoryNames.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/LoggingCategoryNames.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/MeteredStream.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/MeteredStream.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/MeteredStream.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/MeteredStream.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/MultifileTextWriter.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/MultifileTextWriter.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/MultifileTextWriter.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/MultifileTextWriter.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/ParallelTextWriter.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ParallelTextWriter.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/ParallelTextWriter.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/ParallelTextWriter.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/PostRotationAction.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/PostRotationAction.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/PostRotationAction.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/PostRotationAction.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/RetentionPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/RetentionPolicy.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/RetentionPolicy.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/RetentionPolicy.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/RotatableLogFile.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/RotatableLogFile.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/RotatableLogFile.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/RotatableLogFile.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/RotationActionThread.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/RotationActionThread.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/RotationActionThread.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/RotationActionThread.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/RotationPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/RotationPolicy.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/RotationPolicy.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/RotationPolicy.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/SignatureAction.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/SignatureAction.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/SignatureAction.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/SignatureAction.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/SizeBasedRetentionPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRetentionPolicy.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/SizeBasedRetentionPolicy.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRetentionPolicy.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/SizeBasedRotationPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRotationPolicy.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/SizeBasedRotationPolicy.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRotationPolicy.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/TextAccessLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAccessLogPublisher.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/TextAccessLogPublisher.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAccessLogPublisher.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/TextAuditLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAuditLogPublisher.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/TextAuditLogPublisher.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAuditLogPublisher.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/TextDebugLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextDebugLogPublisher.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/TextDebugLogPublisher.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/TextDebugLogPublisher.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/TextErrorLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextErrorLogPublisher.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/TextErrorLogPublisher.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/TextErrorLogPublisher.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/TextHTTPAccessLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextHTTPAccessLogPublisher.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/TextHTTPAccessLogPublisher.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/TextHTTPAccessLogPublisher.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/TextWriter.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextWriter.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/TextWriter.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/TextWriter.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/ThreadFilterTextErrorLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ThreadFilterTextErrorLogPublisher.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/ThreadFilterTextErrorLogPublisher.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/ThreadFilterTextErrorLogPublisher.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/TimeLimitRotationPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TimeLimitRotationPolicy.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/TimeLimitRotationPolicy.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/TimeLimitRotationPolicy.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/TimeStampNaming.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TimeStampNaming.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/TimeStampNaming.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/TimeStampNaming.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/TraceSettings.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TraceSettings.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/TraceSettings.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/TraceSettings.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/ZIPAction.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ZIPAction.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/ZIPAction.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/ZIPAction.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/loggers/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/loggers/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/loggers/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/monitors/BackendMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/BackendMonitor.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/monitors/BackendMonitor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/monitors/BackendMonitor.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/monitors/ClientConnectionMonitorProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/ClientConnectionMonitorProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/monitors/ClientConnectionMonitorProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/monitors/ClientConnectionMonitorProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/monitors/ConnectionHandlerMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/ConnectionHandlerMonitor.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/monitors/ConnectionHandlerMonitor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/monitors/ConnectionHandlerMonitor.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/monitors/DatabaseEnvironmentMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/DatabaseEnvironmentMonitor.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/monitors/DatabaseEnvironmentMonitor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/monitors/DatabaseEnvironmentMonitor.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/monitors/EntryCacheMonitorProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/EntryCacheMonitorProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/monitors/EntryCacheMonitorProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/monitors/EntryCacheMonitorProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/monitors/MemoryUsageMonitorProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/MemoryUsageMonitorProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/monitors/MemoryUsageMonitorProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/monitors/MemoryUsageMonitorProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/monitors/ParallelWorkQueueMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/ParallelWorkQueueMonitor.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/monitors/ParallelWorkQueueMonitor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/monitors/ParallelWorkQueueMonitor.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/monitors/StackTraceMonitorProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/StackTraceMonitorProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/monitors/StackTraceMonitorProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/monitors/StackTraceMonitorProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/monitors/SystemInfoMonitorProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/SystemInfoMonitorProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/monitors/SystemInfoMonitorProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/monitors/SystemInfoMonitorProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/monitors/TraditionalWorkQueueMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/TraditionalWorkQueueMonitor.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/monitors/TraditionalWorkQueueMonitor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/monitors/TraditionalWorkQueueMonitor.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/monitors/VersionMonitorProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/VersionMonitorProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/monitors/VersionMonitorProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/monitors/VersionMonitorProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/monitors/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/monitors/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/monitors/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/plugins/AttributeCleanupPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/AttributeCleanupPlugin.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/plugins/AttributeCleanupPlugin.java
rename to opendj-server-legacy/src/main/java/org/opends/server/plugins/AttributeCleanupPlugin.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/plugins/ChangeNumberControlPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/ChangeNumberControlPlugin.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/plugins/ChangeNumberControlPlugin.java
rename to opendj-server-legacy/src/main/java/org/opends/server/plugins/ChangeNumberControlPlugin.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/plugins/EntryUUIDPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/EntryUUIDPlugin.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/plugins/EntryUUIDPlugin.java
rename to opendj-server-legacy/src/main/java/org/opends/server/plugins/EntryUUIDPlugin.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/plugins/LDAPADListPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/LDAPADListPlugin.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/plugins/LDAPADListPlugin.java
rename to opendj-server-legacy/src/main/java/org/opends/server/plugins/LDAPADListPlugin.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/plugins/LastModPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/LastModPlugin.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/plugins/LastModPlugin.java
rename to opendj-server-legacy/src/main/java/org/opends/server/plugins/LastModPlugin.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/PasswordPolicyImportPlugin.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java
rename to opendj-server-legacy/src/main/java/org/opends/server/plugins/PasswordPolicyImportPlugin.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java
rename to opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/plugins/SambaPasswordPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/SambaPasswordPlugin.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/plugins/SambaPasswordPlugin.java
rename to opendj-server-legacy/src/main/java/org/opends/server/plugins/SambaPasswordPlugin.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/plugins/SevenBitCleanPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/SevenBitCleanPlugin.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/plugins/SevenBitCleanPlugin.java
rename to opendj-server-legacy/src/main/java/org/opends/server/plugins/SevenBitCleanPlugin.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/plugins/UniqueAttributePlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/UniqueAttributePlugin.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/plugins/UniqueAttributePlugin.java
rename to opendj-server-legacy/src/main/java/org/opends/server/plugins/UniqueAttributePlugin.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/plugins/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/plugins/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/plugins/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/plugins/profiler/ProfileStack.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfileStack.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/plugins/profiler/ProfileStack.java
rename to opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfileStack.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/plugins/profiler/ProfileStackFrame.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfileStackFrame.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/plugins/profiler/ProfileStackFrame.java
rename to opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfileStackFrame.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/plugins/profiler/ProfileViewer.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfileViewer.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/plugins/profiler/ProfileViewer.java
rename to opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfileViewer.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/plugins/profiler/ProfilerPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfilerPlugin.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/plugins/profiler/ProfilerPlugin.java
rename to opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfilerPlugin.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/plugins/profiler/ProfilerThread.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfilerThread.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/plugins/profiler/ProfilerThread.java
rename to opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfilerThread.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/plugins/profiler/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/plugins/profiler/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/LDIFConnectionHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/LDIFConnectionHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/LDIFConnectionHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/LDIFConnectionHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/asn1/GSERException.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/asn1/GSERException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/asn1/GSERException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/asn1/GSERException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/asn1/GSERParser.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/asn1/GSERParser.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/asn1/GSERParser.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/asn1/GSERParser.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/asn1/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/asn1/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/asn1/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/asn1/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/http/CollectClientConnectionsFilter.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/CollectClientConnectionsFilter.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/http/CollectClientConnectionsFilter.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/http/CollectClientConnectionsFilter.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/http/HTTPAuthenticationConfig.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPAuthenticationConfig.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/http/HTTPAuthenticationConfig.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPAuthenticationConfig.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/http/HTTPClientConnection.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPClientConnection.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/http/HTTPClientConnection.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPClientConnection.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/http/HTTPConnectionHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPConnectionHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/http/HTTPConnectionHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPConnectionHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/http/HTTPStatistics.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPStatistics.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/http/HTTPStatistics.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPStatistics.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/http/HTTPStatsProbe.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPStatsProbe.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/http/HTTPStatsProbe.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPStatsProbe.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/http/SdkConnectionAdapter.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/SdkConnectionAdapter.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/http/SdkConnectionAdapter.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/http/SdkConnectionAdapter.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/http/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/http/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/http/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/internal/AbstractRequestImpl.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/AbstractRequestImpl.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/internal/AbstractRequestImpl.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/AbstractRequestImpl.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/internal/InternalClientConnection.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalClientConnection.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/internal/InternalClientConnection.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalClientConnection.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/internal/InternalConnectionHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalConnectionHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/internal/InternalConnectionHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalConnectionHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/internal/InternalLDAPInputStream.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPInputStream.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/internal/InternalLDAPInputStream.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPInputStream.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/internal/InternalLDAPOutputStream.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPOutputStream.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/internal/InternalLDAPOutputStream.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPOutputStream.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/internal/InternalLDAPSocket.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPSocket.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/internal/InternalLDAPSocket.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPSocket.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/internal/InternalLDAPSocketFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPSocketFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/internal/InternalLDAPSocketFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPSocketFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/internal/InternalMozillaLDAPSocketFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalMozillaLDAPSocketFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/internal/InternalMozillaLDAPSocketFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalMozillaLDAPSocketFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/internal/InternalSearchListener.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalSearchListener.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/internal/InternalSearchListener.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalSearchListener.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/internal/InternalSearchOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalSearchOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/internal/InternalSearchOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalSearchOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/internal/NullLDAPMessage.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/NullLDAPMessage.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/internal/NullLDAPMessage.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/NullLDAPMessage.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/internal/Requests.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/Requests.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/internal/Requests.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/Requests.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/internal/SearchRequest.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/SearchRequest.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/internal/SearchRequest.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/SearchRequest.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/internal/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/internal/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/jmx/Credential.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/Credential.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/jmx/Credential.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/Credential.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/jmx/DirectoryRMIClientSocketFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/DirectoryRMIClientSocketFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/jmx/DirectoryRMIClientSocketFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/DirectoryRMIClientSocketFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxClientConnection.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxClientConnection.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxConnectionHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxConnectionHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/jmx/OpendsJmxConnector.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsJmxConnector.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/jmx/OpendsJmxConnector.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsJmxConnector.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/jmx/OpendsJmxPrincipal.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsJmxPrincipal.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/jmx/OpendsJmxPrincipal.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsJmxPrincipal.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/jmx/OpendsRMIJRMPServerImpl.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsRMIJRMPServerImpl.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/jmx/OpendsRMIJRMPServerImpl.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsRMIJRMPServerImpl.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/jmx/OpendsRmiServerSocketFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsRmiServerSocketFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/jmx/OpendsRmiServerSocketFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsRmiServerSocketFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/jmx/RmiAuthenticator.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/RmiAuthenticator.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/jmx/RmiAuthenticator.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/RmiAuthenticator.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/jmx/RmiConnector.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/RmiConnector.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/jmx/RmiConnector.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/RmiConnector.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/jmx/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/jmx/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/ldap/ASN1ByteChannelReader.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ASN1ByteChannelReader.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/ldap/ASN1ByteChannelReader.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ASN1ByteChannelReader.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/ldap/AbandonRequestProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/AbandonRequestProtocolOp.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/ldap/AbandonRequestProtocolOp.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/AbandonRequestProtocolOp.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/ldap/AddRequestProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/AddRequestProtocolOp.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/ldap/AddRequestProtocolOp.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/AddRequestProtocolOp.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/ldap/AddResponseProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/AddResponseProtocolOp.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/ldap/AddResponseProtocolOp.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/AddResponseProtocolOp.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/ldap/BindRequestProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/BindRequestProtocolOp.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/ldap/BindRequestProtocolOp.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/BindRequestProtocolOp.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/ldap/BindResponseProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/BindResponseProtocolOp.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/ldap/BindResponseProtocolOp.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/BindResponseProtocolOp.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/ldap/CompareRequestProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/CompareRequestProtocolOp.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/ldap/CompareRequestProtocolOp.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/CompareRequestProtocolOp.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/ldap/CompareResponseProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/CompareResponseProtocolOp.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/ldap/CompareResponseProtocolOp.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/CompareResponseProtocolOp.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/ldap/DeleteRequestProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/DeleteRequestProtocolOp.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/ldap/DeleteRequestProtocolOp.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/DeleteRequestProtocolOp.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/ldap/DeleteResponseProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/DeleteResponseProtocolOp.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/ldap/DeleteResponseProtocolOp.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/DeleteResponseProtocolOp.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/ldap/ExtendedRequestProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ExtendedRequestProtocolOp.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/ldap/ExtendedRequestProtocolOp.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ExtendedRequestProtocolOp.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/ldap/ExtendedResponseProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ExtendedResponseProtocolOp.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/ldap/ExtendedResponseProtocolOp.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ExtendedResponseProtocolOp.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/ldap/IntermediateResponseProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/IntermediateResponseProtocolOp.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/ldap/IntermediateResponseProtocolOp.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/IntermediateResponseProtocolOp.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/ldap/LDAPAttribute.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPAttribute.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/ldap/LDAPAttribute.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPAttribute.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPClientConnection.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPClientConnection.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/ldap/LDAPConstants.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConstants.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/ldap/LDAPConstants.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConstants.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/ldap/LDAPControl.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPControl.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/ldap/LDAPControl.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPControl.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/ldap/LDAPFilter.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPFilter.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/ldap/LDAPFilter.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPFilter.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/ldap/LDAPMessage.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPMessage.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/ldap/LDAPMessage.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPMessage.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/ldap/LDAPModification.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPModification.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/ldap/LDAPModification.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPModification.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/ldap/LDAPReader.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPReader.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/ldap/LDAPReader.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPReader.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/ldap/LDAPRequestHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPRequestHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/ldap/LDAPRequestHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPRequestHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/ldap/LDAPResultCode.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPResultCode.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/ldap/LDAPResultCode.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPResultCode.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/ldap/LDAPStatistics.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPStatistics.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/ldap/LDAPStatistics.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPStatistics.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/ldap/ModifyDNRequestProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyDNRequestProtocolOp.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/ldap/ModifyDNRequestProtocolOp.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyDNRequestProtocolOp.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/ldap/ModifyDNResponseProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyDNResponseProtocolOp.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/ldap/ModifyDNResponseProtocolOp.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyDNResponseProtocolOp.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/ldap/ModifyRequestProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyRequestProtocolOp.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/ldap/ModifyRequestProtocolOp.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyRequestProtocolOp.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/ldap/ModifyResponseProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyResponseProtocolOp.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/ldap/ModifyResponseProtocolOp.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyResponseProtocolOp.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/ldap/ProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ProtocolOp.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/ldap/ProtocolOp.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ProtocolOp.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/ldap/SearchRequestProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchRequestProtocolOp.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/ldap/SearchRequestProtocolOp.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchRequestProtocolOp.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/ldap/SearchResultDoneProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultDoneProtocolOp.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/ldap/SearchResultDoneProtocolOp.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultDoneProtocolOp.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/ldap/SearchResultReferenceProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultReferenceProtocolOp.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/ldap/SearchResultReferenceProtocolOp.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultReferenceProtocolOp.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/ldap/UnbindRequestProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/UnbindRequestProtocolOp.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/ldap/UnbindRequestProtocolOp.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/UnbindRequestProtocolOp.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/ldap/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/ldap/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/protocols/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/protocols/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/protocols/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/common/AssuredMode.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/common/AssuredMode.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/common/AssuredMode.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/common/AssuredMode.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/common/CSN.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/common/CSN.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/common/CSN.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/common/CSN.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/common/CSNGenerator.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/common/CSNGenerator.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/common/CSNGenerator.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/common/CSNGenerator.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/common/DSInfo.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/common/DSInfo.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/common/DSInfo.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/common/DSInfo.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/common/MultiDomainServerState.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/common/MultiDomainServerState.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/common/MultiDomainServerState.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/common/MultiDomainServerState.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/common/RSInfo.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/common/RSInfo.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/common/RSInfo.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/common/RSInfo.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/common/ServerState.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/common/ServerState.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/common/ServerState.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/common/ServerState.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/common/ServerStatus.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/common/ServerStatus.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/common/ServerStatus.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/common/ServerStatus.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/common/StatusMachine.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/common/StatusMachine.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/common/StatusMachine.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/common/StatusMachine.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/common/StatusMachineEvent.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/common/StatusMachineEvent.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/common/StatusMachineEvent.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/common/StatusMachineEvent.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/common/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/common/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/common/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/common/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/plugin/AttrHistorical.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistorical.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/plugin/AttrHistorical.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistorical.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/plugin/AttrHistoricalMultiple.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalMultiple.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/plugin/AttrHistoricalMultiple.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalMultiple.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/plugin/AttrHistoricalSingle.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalSingle.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/plugin/AttrHistoricalSingle.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalSingle.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/plugin/AttrHistoricalWithOptions.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalWithOptions.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/plugin/AttrHistoricalWithOptions.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalWithOptions.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/plugin/AttrValueHistorical.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrValueHistorical.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/plugin/AttrValueHistorical.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrValueHistorical.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/plugin/EntryHistorical.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/EntryHistorical.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/plugin/EntryHistorical.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/EntryHistorical.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/plugin/ExternalChangelogDomain.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ExternalChangelogDomain.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/plugin/ExternalChangelogDomain.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ExternalChangelogDomain.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/plugin/FakeAddOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeAddOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/plugin/FakeAddOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeAddOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/plugin/FakeDelOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeDelOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/plugin/FakeDelOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeDelOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/plugin/FakeModdnOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeModdnOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/plugin/FakeModdnOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeModdnOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/plugin/FakeModifyOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeModifyOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/plugin/FakeModifyOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeModifyOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/plugin/FakeOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/plugin/FakeOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/plugin/FakeOperationComparator.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeOperationComparator.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/plugin/FakeOperationComparator.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeOperationComparator.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/plugin/FractionalLDIFImportPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FractionalLDIFImportPlugin.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/plugin/FractionalLDIFImportPlugin.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FractionalLDIFImportPlugin.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/plugin/GenerationIdChecksum.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/GenerationIdChecksum.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/plugin/GenerationIdChecksum.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/GenerationIdChecksum.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/plugin/HistAttrModificationKey.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistAttrModificationKey.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/plugin/HistAttrModificationKey.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistAttrModificationKey.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/plugin/HistoricalAttributeValue.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistoricalAttributeValue.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/plugin/HistoricalAttributeValue.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistoricalAttributeValue.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRuleImpl.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRuleImpl.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRuleImpl.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRuleImpl.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/plugin/MultimasterReplication.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/MultimasterReplication.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/MultimasterReplication.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/plugin/PendingChange.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/PendingChange.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/plugin/PendingChange.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/PendingChange.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/plugin/PendingChanges.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/PendingChanges.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/plugin/PendingChanges.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/PendingChanges.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/plugin/PersistentServerState.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/PersistentServerState.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/plugin/PersistentServerState.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/PersistentServerState.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/plugin/RemotePendingChanges.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/RemotePendingChanges.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/plugin/RemotePendingChanges.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/RemotePendingChanges.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/plugin/ReplLDIFOutputStream.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplLDIFOutputStream.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/plugin/ReplLDIFOutputStream.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplLDIFOutputStream.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/plugin/ReplayThread.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplayThread.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/plugin/ReplayThread.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplayThread.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/plugin/ReplicationRepairRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplicationRepairRequestControl.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/plugin/ReplicationRepairRequestControl.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplicationRepairRequestControl.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/plugin/ReplicationServerListener.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplicationServerListener.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/plugin/ReplicationServerListener.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplicationServerListener.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/plugin/UpdateToReplay.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/UpdateToReplay.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/plugin/UpdateToReplay.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/UpdateToReplay.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/plugin/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/plugin/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/AckMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/AckMsg.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/AckMsg.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/AckMsg.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/AddContext.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/AddContext.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/AddContext.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/AddContext.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/AddMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/AddMsg.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/AddMsg.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/AddMsg.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/ByteArrayBuilder.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ByteArrayBuilder.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/ByteArrayBuilder.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ByteArrayBuilder.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/ByteArrayScanner.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ByteArrayScanner.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/ByteArrayScanner.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ByteArrayScanner.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/ChangeStatusMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ChangeStatusMsg.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/ChangeStatusMsg.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ChangeStatusMsg.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/ChangeTimeHeartbeatMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ChangeTimeHeartbeatMsg.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/ChangeTimeHeartbeatMsg.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ChangeTimeHeartbeatMsg.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/DeleteContext.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/DeleteContext.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/DeleteContext.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/DeleteContext.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/DeleteMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/DeleteMsg.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/DeleteMsg.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/DeleteMsg.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/DoneMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/DoneMsg.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/DoneMsg.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/DoneMsg.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/EntryMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/EntryMsg.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/EntryMsg.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/EntryMsg.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/ErrorMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ErrorMsg.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/ErrorMsg.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ErrorMsg.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/HeartbeatMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/HeartbeatMsg.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/HeartbeatMsg.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/HeartbeatMsg.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/HeartbeatThread.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/HeartbeatThread.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/HeartbeatThread.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/HeartbeatThread.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/InitializeRcvAckMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/InitializeRcvAckMsg.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/InitializeRcvAckMsg.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/InitializeRcvAckMsg.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/InitializeRequestMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/InitializeRequestMsg.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/InitializeRequestMsg.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/InitializeRequestMsg.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/InitializeTargetMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/InitializeTargetMsg.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/InitializeTargetMsg.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/InitializeTargetMsg.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/LDAPUpdateMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/LDAPUpdateMsg.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/LDAPUpdateMsg.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/LDAPUpdateMsg.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/ModifyCommonMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ModifyCommonMsg.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/ModifyCommonMsg.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ModifyCommonMsg.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/ModifyContext.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ModifyContext.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/ModifyContext.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ModifyContext.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/ModifyDNMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ModifyDNMsg.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/ModifyDNMsg.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ModifyDNMsg.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/ModifyDnContext.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ModifyDnContext.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/ModifyDnContext.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ModifyDnContext.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/ModifyMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ModifyMsg.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/ModifyMsg.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ModifyMsg.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/MonitorMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/MonitorMsg.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/MonitorMsg.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/MonitorMsg.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/MonitorRequestMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/MonitorRequestMsg.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/MonitorRequestMsg.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/MonitorRequestMsg.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/NotSupportedOldVersionPDUException.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/NotSupportedOldVersionPDUException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/NotSupportedOldVersionPDUException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/NotSupportedOldVersionPDUException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/OperationContext.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/OperationContext.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/OperationContext.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/OperationContext.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/ProtocolVersion.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ProtocolVersion.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/ProtocolVersion.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ProtocolVersion.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/ReplServerStartDSMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ReplServerStartDSMsg.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/ReplServerStartDSMsg.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ReplServerStartDSMsg.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/ReplServerStartMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ReplServerStartMsg.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/ReplServerStartMsg.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ReplServerStartMsg.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ReplSessionSecurity.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ReplSessionSecurity.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/ReplicaOfflineMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ReplicaOfflineMsg.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/ReplicaOfflineMsg.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ReplicaOfflineMsg.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/ReplicationMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ReplicationMsg.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/ReplicationMsg.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ReplicationMsg.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/ResetGenerationIdMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ResetGenerationIdMsg.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/ResetGenerationIdMsg.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ResetGenerationIdMsg.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/RoutableMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/RoutableMsg.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/RoutableMsg.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/RoutableMsg.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/ServerStartMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ServerStartMsg.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/ServerStartMsg.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ServerStartMsg.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/Session.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/Session.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/Session.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/Session.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/StartMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/StartMsg.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/StartMsg.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/StartMsg.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/StartSessionMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/StartSessionMsg.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/StartSessionMsg.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/StartSessionMsg.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/StopMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/StopMsg.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/StopMsg.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/StopMsg.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/TopologyMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/TopologyMsg.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/TopologyMsg.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/TopologyMsg.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/UpdateMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/UpdateMsg.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/UpdateMsg.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/UpdateMsg.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/WindowMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/WindowMsg.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/WindowMsg.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/WindowMsg.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/WindowProbeMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/WindowProbeMsg.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/WindowProbeMsg.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/WindowProbeMsg.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/protocol/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/protocol/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/ChangelogBaseDNVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ChangelogBaseDNVirtualAttributeProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/ChangelogBaseDNVirtualAttributeProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/ChangelogBaseDNVirtualAttributeProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/ChangelogState.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ChangelogState.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/ChangelogState.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/ChangelogState.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/DataServerHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/DataServerHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/DataServerHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/DataServerHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/ExpectedAcksInfo.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ExpectedAcksInfo.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/ExpectedAcksInfo.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/ExpectedAcksInfo.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/FirstChangeNumberVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/FirstChangeNumberVirtualAttributeProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/FirstChangeNumberVirtualAttributeProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/FirstChangeNumberVirtualAttributeProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/LastChangeNumberVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/LastChangeNumberVirtualAttributeProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/LastChangeNumberVirtualAttributeProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/LastChangeNumberVirtualAttributeProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/LastCookieVirtualProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/LastCookieVirtualProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/LastCookieVirtualProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/LastCookieVirtualProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/LightweightServerHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/LightweightServerHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/LightweightServerHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/LightweightServerHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/MessageHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/MessageHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/MessageHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/MessageHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/MonitoringPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/MonitoringPublisher.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/MonitoringPublisher.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/MonitoringPublisher.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/MsgQueue.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/MsgQueue.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/MsgQueue.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/MsgQueue.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/NotAssuredUpdateMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/NotAssuredUpdateMsg.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/NotAssuredUpdateMsg.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/NotAssuredUpdateMsg.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/ReplicationDomainMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationDomainMonitor.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/ReplicationDomainMonitor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationDomainMonitor.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/ReplicationDomainMonitorData.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationDomainMonitorData.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/ReplicationDomainMonitorData.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationDomainMonitorData.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/ReplicationServer.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServer.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/ReplicationServer.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServer.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/ReplicationServerConnectThread.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerConnectThread.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/ReplicationServerConnectThread.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerConnectThread.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/ReplicationServerDomain.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerDomain.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerDomain.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/ReplicationServerHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/ReplicationServerListenThread.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerListenThread.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/ReplicationServerListenThread.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerListenThread.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/SafeDataExpectedAcksInfo.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/SafeDataExpectedAcksInfo.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/SafeDataExpectedAcksInfo.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/SafeDataExpectedAcksInfo.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/SafeReadExpectedAcksInfo.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/SafeReadExpectedAcksInfo.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/SafeReadExpectedAcksInfo.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/SafeReadExpectedAcksInfo.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/ServerHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ServerHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/ServerHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/ServerHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/ServerReader.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ServerReader.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/ServerReader.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/ServerReader.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/ServerWriter.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ServerWriter.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/ServerWriter.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/ServerWriter.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/StatusAnalyzer.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/StatusAnalyzer.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/StatusAnalyzer.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/StatusAnalyzer.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/api/ChangeNumberIndexDB.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/ChangeNumberIndexDB.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/api/ChangeNumberIndexDB.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/ChangeNumberIndexDB.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/api/ChangeNumberIndexRecord.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/ChangeNumberIndexRecord.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/api/ChangeNumberIndexRecord.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/ChangeNumberIndexRecord.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/api/ChangelogDB.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/ChangelogDB.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/api/ChangelogDB.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/ChangelogDB.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/api/ChangelogException.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/ChangelogException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/api/ChangelogException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/ChangelogException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/api/DBCursor.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/DBCursor.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/api/DBCursor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/DBCursor.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/api/ReplicaId.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/ReplicaId.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/api/ReplicaId.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/ReplicaId.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/api/ReplicationDomainDB.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/ReplicationDomainDB.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/api/ReplicationDomainDB.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/ReplicationDomainDB.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/api/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/api/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/file/BlockLogReader.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/BlockLogReader.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/file/BlockLogReader.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/BlockLogReader.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/file/BlockLogWriter.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/BlockLogWriter.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/file/BlockLogWriter.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/BlockLogWriter.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/file/DecodingException.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/DecodingException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/file/DecodingException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/DecodingException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDB.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDB.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDB.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDB.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDBCursor.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDBCursor.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDBCursor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDBCursor.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/file/FileChangelogDB.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/FileChangelogDB.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/file/FileChangelogDB.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/FileChangelogDB.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/file/FileReplicaDB.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/FileReplicaDB.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/file/FileReplicaDB.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/FileReplicaDB.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/file/FileReplicaDBCursor.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/FileReplicaDBCursor.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/file/FileReplicaDBCursor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/FileReplicaDBCursor.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/file/Log.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/Log.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/file/Log.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/Log.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/file/LogFile.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/LogFile.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/file/LogFile.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/LogFile.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/file/LogReaderPool.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/LogReaderPool.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/file/LogReaderPool.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/LogReaderPool.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/file/LogWriter.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/LogWriter.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/file/LogWriter.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/LogWriter.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/file/Record.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/Record.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/file/Record.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/Record.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/file/RecordParser.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/RecordParser.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/file/RecordParser.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/RecordParser.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/file/ReplicationEnvironment.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/ReplicationEnvironment.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/file/ReplicationEnvironment.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/ReplicationEnvironment.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/file/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/file/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/je/ChangeNumberIndexer.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ChangeNumberIndexer.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/je/ChangeNumberIndexer.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ChangeNumberIndexer.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/je/CompositeDBCursor.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/CompositeDBCursor.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/je/CompositeDBCursor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/CompositeDBCursor.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/je/DomainDBCursor.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/DomainDBCursor.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/je/DomainDBCursor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/DomainDBCursor.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/je/DraftCNDB.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/DraftCNDB.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/je/DraftCNDB.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/DraftCNDB.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/je/DraftCNData.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/DraftCNData.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/je/DraftCNData.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/DraftCNData.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/je/ECLEnabledDomainPredicate.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ECLEnabledDomainPredicate.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/je/ECLEnabledDomainPredicate.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ECLEnabledDomainPredicate.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/je/ECLMultiDomainDBCursor.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ECLMultiDomainDBCursor.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/je/ECLMultiDomainDBCursor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ECLMultiDomainDBCursor.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDBCursor.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDBCursor.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDBCursor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDBCursor.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/je/JEReplicaDB.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEReplicaDB.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/je/JEReplicaDB.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEReplicaDB.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/je/JEReplicaDBCursor.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEReplicaDBCursor.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/je/JEReplicaDBCursor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEReplicaDBCursor.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/je/JEUtils.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEUtils.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/je/JEUtils.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEUtils.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/je/MultiDomainDBCursor.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/MultiDomainDBCursor.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/je/MultiDomainDBCursor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/MultiDomainDBCursor.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/je/ReplicaCursor.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ReplicaCursor.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/je/ReplicaCursor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ReplicaCursor.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/je/ReplicationDB.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ReplicationDB.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/je/ReplicationDB.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ReplicationDB.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/je/ReplicationDraftCNKey.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ReplicationDraftCNKey.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/je/ReplicationDraftCNKey.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ReplicationDraftCNKey.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/je/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/changelog/je/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/server/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/server/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/server/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/service/CTHeartbeatPublisherThread.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/CTHeartbeatPublisherThread.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/service/CTHeartbeatPublisherThread.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/service/CTHeartbeatPublisherThread.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/service/DSRSShutdownSync.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/DSRSShutdownSync.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/service/DSRSShutdownSync.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/service/DSRSShutdownSync.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/service/HeartbeatMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/HeartbeatMonitor.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/service/HeartbeatMonitor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/service/HeartbeatMonitor.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/service/ReplInputStream.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplInputStream.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/service/ReplInputStream.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplInputStream.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/service/ReplOutputStream.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplOutputStream.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/service/ReplOutputStream.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplOutputStream.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/service/ReplicationBroker.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationBroker.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/service/ReplicationBroker.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationBroker.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/service/ReplicationDomain.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationDomain.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/service/ReplicationDomain.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationDomain.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/service/ReplicationMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationMonitor.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/service/ReplicationMonitor.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationMonitor.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/replication/service/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/replication/service/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/replication/service/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/AbstractPasswordEqualityMatchingRuleImpl.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/AbstractPasswordEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/AbstractPasswordEqualityMatchingRuleImpl.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/AbstractPasswordEqualityMatchingRuleImpl.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/AciSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/AciSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/AciSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/AciSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/AttributeTypeSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/AttributeTypeSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/AttributeTypeSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/AttributeTypeSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/AuthPasswordEqualityMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/AuthPasswordEqualityMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/AuthPasswordExactEqualityMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/AuthPasswordExactEqualityMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/AuthPasswordSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/AuthPasswordSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/AuthPasswordSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/AuthPasswordSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/BinarySyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/BinarySyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/BinarySyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/BinarySyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/BitStringEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/BitStringEqualityMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/BitStringEqualityMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/BitStringEqualityMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/BitStringSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/BitStringSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/BitStringSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/BitStringSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/BooleanEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/BooleanEqualityMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/BooleanEqualityMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/BooleanEqualityMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/BooleanSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/BooleanSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/BooleanSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/BooleanSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/CaseExactEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactEqualityMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/CaseExactEqualityMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactEqualityMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactIA5EqualityMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactIA5EqualityMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactIA5SubstringMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactIA5SubstringMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/CaseExactOrderingMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactOrderingMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/CaseExactOrderingMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactOrderingMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/CaseExactSubstringMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactSubstringMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/CaseExactSubstringMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactSubstringMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreEqualityMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreEqualityMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/CaseIgnoreListEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreListEqualityMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/CaseIgnoreListEqualityMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreListEqualityMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/CaseIgnoreListSubstringMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreListSubstringMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/CaseIgnoreListSubstringMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreListSubstringMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreOrderingMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreOrderingMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreSubstringMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreSubstringMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/CertificateExactAssertionSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateExactAssertionSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/CertificateExactAssertionSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateExactAssertionSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/CertificateExactMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateExactMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/CertificateExactMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateExactMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/CertificateListSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateListSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/CertificateListSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateListSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/CertificatePairSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificatePairSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/CertificatePairSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/CertificatePairSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/CertificateSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/CertificateSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CollationMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/CollationMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/CoreSchemaProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CoreSchemaProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/CoreSchemaProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/CoreSchemaProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/CountryStringSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CountryStringSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/CountryStringSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/CountryStringSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/DITContentRuleSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/DITContentRuleSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/DITContentRuleSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/DITContentRuleSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/DITStructureRuleSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/DITStructureRuleSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/DITStructureRuleSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/DITStructureRuleSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/DeliveryMethodSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/DeliveryMethodSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/DeliveryMethodSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/DeliveryMethodSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/DirectoryStringSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/DirectoryStringSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/DirectoryStringSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/DirectoryStringSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/DistinguishedNameEqualityMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/DistinguishedNameEqualityMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/DistinguishedNameSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/DistinguishedNameSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/DistinguishedNameSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/DistinguishedNameSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/EnhancedGuideSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/EnhancedGuideSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/EnhancedGuideSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/EnhancedGuideSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/FaxNumberSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/FaxNumberSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/FaxNumberSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/FaxNumberSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/FaxSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/FaxSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/FaxSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/FaxSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/GeneralizedTimeEqualityMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/GeneralizedTimeEqualityMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/GeneralizedTimeOrderingMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/GeneralizedTimeOrderingMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/GeneralizedTimeSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/GeneralizedTimeSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/GuideSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/GuideSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/GuideSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/GuideSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/IA5StringSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/IA5StringSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/IA5StringSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/IA5StringSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/IntegerEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerEqualityMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/IntegerEqualityMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerEqualityMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/IntegerOrderingMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerOrderingMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/IntegerOrderingMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerOrderingMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/IntegerSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/IntegerSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/JPEGSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/JPEGSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/JPEGSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/JPEGSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/KeywordEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/KeywordEqualityMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/KeywordEqualityMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/KeywordEqualityMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/MatchingRuleSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/MatchingRuleSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/MatchingRuleSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/MatchingRuleSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/MatchingRuleUseSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/MatchingRuleUseSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/NameAndOptionalUIDSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/NameAndOptionalUIDSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/NameFormSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/NameFormSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/NameFormSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/NameFormSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/NumericStringEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringEqualityMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/NumericStringEqualityMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringEqualityMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/NumericStringOrderingMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringOrderingMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/NumericStringOrderingMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringOrderingMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/NumericStringSubstringMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringSubstringMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/NumericStringSubstringMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringSubstringMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/NumericStringSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/NumericStringSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/OIDSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/OIDSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/OIDSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/OIDSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/ObjectClassSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectClassSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/ObjectClassSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectClassSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectIdentifierEqualityMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectIdentifierEqualityMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/OctetStringEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringEqualityMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/OctetStringEqualityMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringEqualityMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/OctetStringOrderingMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringOrderingMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/OctetStringOrderingMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringOrderingMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/OctetStringSubstringMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringSubstringMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/OctetStringSubstringMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringSubstringMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/OctetStringSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/OctetStringSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/OtherMailboxSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/OtherMailboxSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/OtherMailboxSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/OtherMailboxSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/PostalAddressSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/PostalAddressSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/PostalAddressSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/PostalAddressSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/PresentationAddressEqualityMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/PresentationAddressEqualityMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/PresentationAddressSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/PresentationAddressSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/PresentationAddressSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/PresentationAddressSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/PrintableString.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/PrintableString.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/PrintableString.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/PrintableString.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/PrintableStringSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/PrintableStringSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/PrintableStringSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/PrintableStringSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/ProtocolInformationEqualityMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/ProtocolInformationEqualityMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/ProtocolInformationSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/ProtocolInformationSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/ProtocolInformationSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/ProtocolInformationSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/SchemaConstants.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaConstants.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/SchemaConstants.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaConstants.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/SchemaProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaProvider.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/SchemaProvider.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaProvider.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/SchemaUpdater.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaUpdater.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/SchemaUpdater.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaUpdater.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/SubstringAssertionSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/SubstringAssertionSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/SubstringAssertionSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/SubstringAssertionSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/SubtreeSpecificationSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/SubtreeSpecificationSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/SubtreeSpecificationSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/SubtreeSpecificationSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/SupportedAlgorithmSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/SupportedAlgorithmSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/TelephoneNumberEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/TelephoneNumberEqualityMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/TelephoneNumberEqualityMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/TelephoneNumberEqualityMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/TelephoneNumberSubstringMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/TelephoneNumberSubstringMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/TelephoneNumberSubstringMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/TelephoneNumberSubstringMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/TelephoneNumberSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/TelephoneNumberSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/TelephoneNumberSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/TelephoneNumberSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/TelexNumberSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/TelexNumberSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/TelexNumberSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/TelexNumberSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/TimeBasedMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/TimeBasedMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/TimeBasedMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/TimeBasedMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/UTCTimeSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/UTCTimeSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/UTCTimeSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/UTCTimeSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/UUIDEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/UUIDEqualityMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/UUIDEqualityMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/UUIDEqualityMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/UUIDOrderingMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/UUIDOrderingMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/UUIDOrderingMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/UUIDOrderingMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/UUIDSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/UUIDSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/UUIDSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/UUIDSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/UniqueMemberEqualityMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/UniqueMemberEqualityMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordEqualityMatchingRule.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordEqualityMatchingRule.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordEqualityMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordEqualityMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/UserPasswordExactEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordExactEqualityMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/UserPasswordExactEqualityMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordExactEqualityMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/UserPasswordSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordSyntax.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/UserPasswordSyntax.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordSyntax.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/WordEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/WordEqualityMatchingRuleFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/WordEqualityMatchingRuleFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/WordEqualityMatchingRuleFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/schema/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/schema/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/schema/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tasks/AddSchemaFileTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/AddSchemaFileTask.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tasks/AddSchemaFileTask.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tasks/AddSchemaFileTask.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tasks/BackupTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/BackupTask.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tasks/BackupTask.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tasks/BackupTask.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tasks/DisconnectClientTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/DisconnectClientTask.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tasks/DisconnectClientTask.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tasks/DisconnectClientTask.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tasks/EnterLockdownModeTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/EnterLockdownModeTask.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tasks/EnterLockdownModeTask.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tasks/EnterLockdownModeTask.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tasks/ExportTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/ExportTask.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tasks/ExportTask.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tasks/ExportTask.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tasks/ImportTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/ImportTask.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tasks/ImportTask.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tasks/ImportTask.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tasks/InitializeTargetTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/InitializeTargetTask.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tasks/InitializeTargetTask.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tasks/InitializeTargetTask.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tasks/InitializeTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/InitializeTask.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tasks/InitializeTask.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tasks/InitializeTask.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tasks/LeaveLockdownModeTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/LeaveLockdownModeTask.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tasks/LeaveLockdownModeTask.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tasks/LeaveLockdownModeTask.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tasks/PurgeConflictsHistoricalTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/PurgeConflictsHistoricalTask.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tasks/PurgeConflictsHistoricalTask.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tasks/PurgeConflictsHistoricalTask.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tasks/RebuildTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/RebuildTask.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tasks/RebuildTask.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tasks/RebuildTask.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tasks/RestartTaskThread.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/RestartTaskThread.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tasks/RestartTaskThread.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tasks/RestartTaskThread.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tasks/RestoreTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/RestoreTask.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tasks/RestoreTask.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tasks/RestoreTask.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tasks/SetGenerationIdTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/SetGenerationIdTask.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tasks/SetGenerationIdTask.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tasks/SetGenerationIdTask.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tasks/ShutdownTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/ShutdownTask.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tasks/ShutdownTask.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tasks/ShutdownTask.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tasks/ShutdownTaskThread.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/ShutdownTaskThread.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tasks/ShutdownTaskThread.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tasks/ShutdownTaskThread.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tasks/TaskUtils.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/TaskUtils.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tasks/TaskUtils.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tasks/TaskUtils.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tasks/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tasks/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tasks/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/BackUpDB.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/BackUpDB.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/BackUpDB.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/BackUpDB.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/BackendToolUtils.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/BackendToolUtils.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/BackendToolUtils.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/BackendToolUtils.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/ConfigureDS.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/ConfigureDS.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/ConfigureDS.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/ConfigureDS.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/ConfigureWindowsService.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/ConfigureWindowsService.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/ConfigureWindowsService.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/ConfigureWindowsService.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/CreateRCScript.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/CreateRCScript.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/CreateRCScript.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/CreateRCScript.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/DBTest.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/DBTest.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/DBTest.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/DBTest.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/EncodePassword.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/EncodePassword.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/EncodePassword.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/EncodePassword.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/ExportLDIF.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/ExportLDIF.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/ExportLDIF.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/ExportLDIF.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/ImportLDIF.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/ImportLDIF.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/InstallDS.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/InstallDS.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/InstallDSArgumentParser.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDSArgumentParser.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/InstallDSArgumentParser.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDSArgumentParser.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/JavaPropertiesTool.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/JavaPropertiesTool.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/JavaPropertiesTool.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/JavaPropertiesTool.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/JavaPropertiesToolArgumentParser.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/JavaPropertiesToolArgumentParser.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/JavaPropertiesToolArgumentParser.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/JavaPropertiesToolArgumentParser.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/LDAPAuthenticationHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPAuthenticationHandler.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/LDAPAuthenticationHandler.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPAuthenticationHandler.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/LDAPCompare.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPCompare.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/LDAPCompare.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPCompare.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/LDAPCompareOptions.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPCompareOptions.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/LDAPCompareOptions.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPCompareOptions.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/LDAPConnection.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPConnection.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/LDAPConnection.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPConnection.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/LDAPConnectionException.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPConnectionException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/LDAPConnectionException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPConnectionException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/LDAPConnectionOptions.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPConnectionOptions.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/LDAPConnectionOptions.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPConnectionOptions.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/LDAPDelete.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPDelete.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/LDAPDelete.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPDelete.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/LDAPDeleteOptions.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPDeleteOptions.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/LDAPDeleteOptions.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPDeleteOptions.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/LDAPModify.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPModify.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/LDAPModify.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPModify.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/LDAPModifyOptions.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPModifyOptions.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/LDAPModifyOptions.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPModifyOptions.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/LDAPPasswordModify.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPPasswordModify.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/LDAPPasswordModify.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPPasswordModify.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/LDAPReader.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPReader.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/LDAPReader.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPReader.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/LDAPSearch.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearch.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/LDAPSearch.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearch.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/LDAPSearchOptions.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearchOptions.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/LDAPSearchOptions.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearchOptions.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/LDAPToolOptions.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPToolOptions.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/LDAPToolOptions.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPToolOptions.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/LDAPToolUtils.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPToolUtils.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/LDAPToolUtils.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPToolUtils.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/LDAPWriter.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPWriter.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/LDAPWriter.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPWriter.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/LDIFDiff.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFDiff.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/LDIFDiff.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFDiff.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/LDIFModify.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFModify.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/LDIFModify.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFModify.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/LDIFSearch.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFSearch.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/LDIFSearch.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFSearch.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/ListBackends.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/ListBackends.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/ListBackends.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/ListBackends.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/ManageAccount.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/ManageAccount.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/ManageAccount.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/ManageAccount.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/ManageTasks.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/ManageTasks.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/ManageTasks.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/ManageTasks.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/PromptTrustManager.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/PromptTrustManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/PromptTrustManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/PromptTrustManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/RebuildIndex.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/RebuildIndex.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/RebuildIndex.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/RebuildIndex.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/RestoreDB.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/RestoreDB.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/RestoreDB.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/RestoreDB.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/SSLConnectionException.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/SSLConnectionException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/SSLConnectionException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/SSLConnectionException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/SSLConnectionFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/SSLConnectionFactory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/SSLConnectionFactory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/SSLConnectionFactory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/StartWindowsService.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/StartWindowsService.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/StartWindowsService.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/StartWindowsService.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/StopDS.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/StopDS.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/StopDS.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/StopDS.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/StopWindowsService.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/StopWindowsService.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/StopWindowsService.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/StopWindowsService.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/VerifyIndex.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/VerifyIndex.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/VerifyIndex.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/VerifyIndex.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/WaitForFileDelete.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/WaitForFileDelete.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/WaitForFileDelete.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/WaitForFileDelete.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/dsreplication/DisableReplicationUserData.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/DisableReplicationUserData.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/dsreplication/DisableReplicationUserData.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/DisableReplicationUserData.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/dsreplication/EnableReplicationUserData.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/EnableReplicationUserData.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/dsreplication/EnableReplicationUserData.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/EnableReplicationUserData.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/dsreplication/InitializeAllReplicationUserData.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/InitializeAllReplicationUserData.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/dsreplication/InitializeAllReplicationUserData.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/InitializeAllReplicationUserData.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/dsreplication/InitializeReplicationUserData.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/InitializeReplicationUserData.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/dsreplication/InitializeReplicationUserData.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/InitializeReplicationUserData.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/dsreplication/LocalPurgeHistorical.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/LocalPurgeHistorical.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/dsreplication/LocalPurgeHistorical.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/LocalPurgeHistorical.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/dsreplication/MonoServerReplicationUserData.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/MonoServerReplicationUserData.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/dsreplication/MonoServerReplicationUserData.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/MonoServerReplicationUserData.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/dsreplication/PostExternalInitializationUserData.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/PostExternalInitializationUserData.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/dsreplication/PostExternalInitializationUserData.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/PostExternalInitializationUserData.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/dsreplication/PreExternalInitializationUserData.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/PreExternalInitializationUserData.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/dsreplication/PreExternalInitializationUserData.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/PreExternalInitializationUserData.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/dsreplication/PurgeHistoricalScheduleInformation.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/PurgeHistoricalScheduleInformation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/dsreplication/PurgeHistoricalScheduleInformation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/PurgeHistoricalScheduleInformation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/dsreplication/PurgeHistoricalUserData.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/PurgeHistoricalUserData.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/dsreplication/PurgeHistoricalUserData.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/PurgeHistoricalUserData.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/dsreplication/ReplicationCliException.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/dsreplication/ReplicationCliException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/dsreplication/ReplicationCliReturnCode.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliReturnCode.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/dsreplication/ReplicationCliReturnCode.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliReturnCode.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/dsreplication/ReplicationUserData.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationUserData.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/dsreplication/ReplicationUserData.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationUserData.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/dsreplication/StatusReplicationUserData.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/StatusReplicationUserData.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/dsreplication/StatusReplicationUserData.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/StatusReplicationUserData.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/dsreplication/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/dsreplication/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/makeldif/AttributeValueTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/AttributeValueTag.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/makeldif/AttributeValueTag.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/AttributeValueTag.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/makeldif/Branch.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/Branch.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/makeldif/Branch.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/Branch.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/makeldif/DNTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/DNTag.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/makeldif/DNTag.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/DNTag.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/makeldif/EntryWriter.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/EntryWriter.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/makeldif/EntryWriter.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/EntryWriter.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/makeldif/FileTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/FileTag.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/makeldif/FileTag.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/FileTag.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/makeldif/FirstNameTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/FirstNameTag.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/makeldif/FirstNameTag.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/FirstNameTag.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/makeldif/GUIDTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/GUIDTag.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/makeldif/GUIDTag.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/GUIDTag.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/makeldif/IfAbsentTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/IfAbsentTag.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/makeldif/IfAbsentTag.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/IfAbsentTag.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/makeldif/IfPresentTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/IfPresentTag.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/makeldif/IfPresentTag.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/IfPresentTag.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/makeldif/LastNameTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/LastNameTag.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/makeldif/LastNameTag.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/LastNameTag.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/makeldif/ListTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/ListTag.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/makeldif/ListTag.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/ListTag.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/makeldif/MakeLDIF.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/MakeLDIF.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/makeldif/MakeLDIF.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/MakeLDIF.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/makeldif/MakeLDIFException.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/MakeLDIFException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/makeldif/MakeLDIFException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/MakeLDIFException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/makeldif/MakeLDIFInputStream.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/MakeLDIFInputStream.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/makeldif/MakeLDIFInputStream.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/MakeLDIFInputStream.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/makeldif/MakeLDIFInputStreamThread.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/MakeLDIFInputStreamThread.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/makeldif/MakeLDIFInputStreamThread.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/MakeLDIFInputStreamThread.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/makeldif/ParentDNTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/ParentDNTag.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/makeldif/ParentDNTag.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/ParentDNTag.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/makeldif/PresenceTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/PresenceTag.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/makeldif/PresenceTag.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/PresenceTag.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/makeldif/RDNTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/RDNTag.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/makeldif/RDNTag.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/RDNTag.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/makeldif/RandomTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/RandomTag.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/makeldif/RandomTag.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/RandomTag.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/makeldif/SequentialTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/SequentialTag.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/makeldif/SequentialTag.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/SequentialTag.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/makeldif/StaticTextTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/StaticTextTag.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/makeldif/StaticTextTag.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/StaticTextTag.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/makeldif/Tag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/Tag.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/makeldif/Tag.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/Tag.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/makeldif/TagResult.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TagResult.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/makeldif/TagResult.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TagResult.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/makeldif/Template.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/Template.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/makeldif/Template.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/Template.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/makeldif/TemplateEntry.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateEntry.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/makeldif/TemplateEntry.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateEntry.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/makeldif/TemplateFile.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateFile.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/makeldif/TemplateFile.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateFile.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/makeldif/TemplateLine.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateLine.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/makeldif/TemplateLine.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateLine.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/makeldif/TemplateValue.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateValue.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/makeldif/TemplateValue.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateValue.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/makeldif/UnderscoreDNTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/UnderscoreDNTag.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/makeldif/UnderscoreDNTag.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/UnderscoreDNTag.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/makeldif/UnderscoreParentDNTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/UnderscoreParentDNTag.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/makeldif/UnderscoreParentDNTag.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/UnderscoreParentDNTag.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/makeldif/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/makeldif/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/status/StatusCli.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/status/StatusCli.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/status/StatusCli.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/status/StatusCli.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/status/StatusCliArgumentParser.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/status/StatusCliArgumentParser.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/status/StatusCliArgumentParser.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/status/StatusCliArgumentParser.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/status/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/status/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/status/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/status/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/tasks/TaskClient.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskClient.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/tasks/TaskClient.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskClient.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/tasks/TaskClientException.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskClientException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/tasks/TaskClientException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskClientException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/tasks/TaskEntry.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskEntry.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/tasks/TaskEntry.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskEntry.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/tasks/TaskScheduleInformation.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskScheduleInformation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/tasks/TaskScheduleInformation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskScheduleInformation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/tasks/TaskScheduleInteraction.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskScheduleInteraction.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/tasks/TaskScheduleInteraction.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskScheduleInteraction.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/tasks/TaskScheduleUserData.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskScheduleUserData.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/tasks/TaskScheduleUserData.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskScheduleUserData.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/tasks/TaskTool.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskTool.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/tasks/TaskTool.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskTool.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/tasks/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/tasks/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/upgrade/AbstractUpgradeTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/AbstractUpgradeTask.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/upgrade/AbstractUpgradeTask.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/AbstractUpgradeTask.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/upgrade/FileManager.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/FileManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/upgrade/FileManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/FileManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/upgrade/FormattedNotificationCallback.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/FormattedNotificationCallback.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/upgrade/FormattedNotificationCallback.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/FormattedNotificationCallback.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/upgrade/Installation.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Installation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/upgrade/Installation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Installation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/upgrade/LicenseFile.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/LicenseFile.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/upgrade/LicenseFile.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/LicenseFile.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/upgrade/ProgressNotificationCallback.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/ProgressNotificationCallback.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/upgrade/ProgressNotificationCallback.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/ProgressNotificationCallback.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/upgrade/Upgrade.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/upgrade/Upgrade.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/upgrade/UpgradeCli.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeCli.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/upgrade/UpgradeCli.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeCli.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/upgrade/UpgradeContext.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeContext.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/upgrade/UpgradeContext.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeContext.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/upgrade/UpgradeLog.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeLog.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/upgrade/UpgradeLog.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeLog.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/upgrade/UpgradeTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTask.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/upgrade/UpgradeTask.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTask.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/upgrade/UpgradeUtils.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeUtils.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/upgrade/UpgradeUtils.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeUtils.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/tools/upgrade/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/tools/upgrade/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/AbstractAttribute.java b/opendj-server-legacy/src/main/java/org/opends/server/types/AbstractAttribute.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/AbstractAttribute.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/AbstractAttribute.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/AbstractOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/AbstractOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/AbstractOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/AbstractOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/AcceptRejectWarn.java b/opendj-server-legacy/src/main/java/org/opends/server/types/AcceptRejectWarn.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/AcceptRejectWarn.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/AcceptRejectWarn.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/AccountStatusNotification.java b/opendj-server-legacy/src/main/java/org/opends/server/types/AccountStatusNotification.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/AccountStatusNotification.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/AccountStatusNotification.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/AccountStatusNotificationProperty.java b/opendj-server-legacy/src/main/java/org/opends/server/types/AccountStatusNotificationProperty.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/AccountStatusNotificationProperty.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/AccountStatusNotificationProperty.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/AccountStatusNotificationType.java b/opendj-server-legacy/src/main/java/org/opends/server/types/AccountStatusNotificationType.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/AccountStatusNotificationType.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/AccountStatusNotificationType.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/AdditionalLogItem.java b/opendj-server-legacy/src/main/java/org/opends/server/types/AdditionalLogItem.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/AdditionalLogItem.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/AdditionalLogItem.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/Attribute.java b/opendj-server-legacy/src/main/java/org/opends/server/types/Attribute.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/Attribute.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/Attribute.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/AttributeBuilder.java b/opendj-server-legacy/src/main/java/org/opends/server/types/AttributeBuilder.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/AttributeBuilder.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/AttributeBuilder.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/AttributeParser.java b/opendj-server-legacy/src/main/java/org/opends/server/types/AttributeParser.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/AttributeParser.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/AttributeParser.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/AttributeType.java b/opendj-server-legacy/src/main/java/org/opends/server/types/AttributeType.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/AttributeType.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/AttributeType.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/Attributes.java b/opendj-server-legacy/src/main/java/org/opends/server/types/Attributes.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/Attributes.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/Attributes.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/AuthenticationInfo.java b/opendj-server-legacy/src/main/java/org/opends/server/types/AuthenticationInfo.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/AuthenticationInfo.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/AuthenticationInfo.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/AuthenticationType.java b/opendj-server-legacy/src/main/java/org/opends/server/types/AuthenticationType.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/AuthenticationType.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/AuthenticationType.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/BackupConfig.java b/opendj-server-legacy/src/main/java/org/opends/server/types/BackupConfig.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/BackupConfig.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/BackupConfig.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/BackupDirectory.java b/opendj-server-legacy/src/main/java/org/opends/server/types/BackupDirectory.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/BackupDirectory.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/BackupDirectory.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/BackupInfo.java b/opendj-server-legacy/src/main/java/org/opends/server/types/BackupInfo.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/BackupInfo.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/BackupInfo.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/CacheEntry.java b/opendj-server-legacy/src/main/java/org/opends/server/types/CacheEntry.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/CacheEntry.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/CacheEntry.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/CancelRequest.java b/opendj-server-legacy/src/main/java/org/opends/server/types/CancelRequest.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/CancelRequest.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/CancelRequest.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/CancelResult.java b/opendj-server-legacy/src/main/java/org/opends/server/types/CancelResult.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/CancelResult.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/CancelResult.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/CanceledOperationException.java b/opendj-server-legacy/src/main/java/org/opends/server/types/CanceledOperationException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/CanceledOperationException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/CanceledOperationException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/CollectiveVirtualAttribute.java b/opendj-server-legacy/src/main/java/org/opends/server/types/CollectiveVirtualAttribute.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/CollectiveVirtualAttribute.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/CollectiveVirtualAttribute.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/CommonSchemaElements.java b/opendj-server-legacy/src/main/java/org/opends/server/types/CommonSchemaElements.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/CommonSchemaElements.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/CommonSchemaElements.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/Control.java b/opendj-server-legacy/src/main/java/org/opends/server/types/Control.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/Control.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/Control.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/CryptoManager.java b/opendj-server-legacy/src/main/java/org/opends/server/types/CryptoManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/CryptoManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/CryptoManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/CryptoManagerException.java b/opendj-server-legacy/src/main/java/org/opends/server/types/CryptoManagerException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/CryptoManagerException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/CryptoManagerException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/DITContentRule.java b/opendj-server-legacy/src/main/java/org/opends/server/types/DITContentRule.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/DITContentRule.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/DITContentRule.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/DITStructureRule.java b/opendj-server-legacy/src/main/java/org/opends/server/types/DITStructureRule.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/DITStructureRule.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/DITStructureRule.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/DN.java b/opendj-server-legacy/src/main/java/org/opends/server/types/DN.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/DN.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/DN.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/DirectoryConfig.java b/opendj-server-legacy/src/main/java/org/opends/server/types/DirectoryConfig.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/DirectoryConfig.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/DirectoryConfig.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/DirectoryEnvironmentConfig.java b/opendj-server-legacy/src/main/java/org/opends/server/types/DirectoryEnvironmentConfig.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/DirectoryEnvironmentConfig.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/DirectoryEnvironmentConfig.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/DirectoryException.java b/opendj-server-legacy/src/main/java/org/opends/server/types/DirectoryException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/DirectoryException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/DirectoryException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/DisconnectReason.java b/opendj-server-legacy/src/main/java/org/opends/server/types/DisconnectReason.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/DisconnectReason.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/DisconnectReason.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/Entry.java b/opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/Entry.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/EntryEncodeConfig.java b/opendj-server-legacy/src/main/java/org/opends/server/types/EntryEncodeConfig.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/EntryEncodeConfig.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/EntryEncodeConfig.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/ExistingFileBehavior.java b/opendj-server-legacy/src/main/java/org/opends/server/types/ExistingFileBehavior.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/ExistingFileBehavior.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/ExistingFileBehavior.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/FilePermission.java b/opendj-server-legacy/src/main/java/org/opends/server/types/FilePermission.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/FilePermission.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/FilePermission.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/FilterType.java b/opendj-server-legacy/src/main/java/org/opends/server/types/FilterType.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/FilterType.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/FilterType.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/HostPort.java b/opendj-server-legacy/src/main/java/org/opends/server/types/HostPort.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/HostPort.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/HostPort.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/IdentifiedException.java b/opendj-server-legacy/src/main/java/org/opends/server/types/IdentifiedException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/IdentifiedException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/IdentifiedException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/IndexType.java b/opendj-server-legacy/src/main/java/org/opends/server/types/IndexType.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/IndexType.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/IndexType.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/InitializationException.java b/opendj-server-legacy/src/main/java/org/opends/server/types/InitializationException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/InitializationException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/InitializationException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/IntermediateResponse.java b/opendj-server-legacy/src/main/java/org/opends/server/types/IntermediateResponse.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/IntermediateResponse.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/IntermediateResponse.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/InvokableMethod.java b/opendj-server-legacy/src/main/java/org/opends/server/types/InvokableMethod.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/InvokableMethod.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/InvokableMethod.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/LDAPException.java b/opendj-server-legacy/src/main/java/org/opends/server/types/LDAPException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/LDAPException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/LDAPException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/LDAPSyntaxDescription.java b/opendj-server-legacy/src/main/java/org/opends/server/types/LDAPSyntaxDescription.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/LDAPSyntaxDescription.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/LDAPSyntaxDescription.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/LDAPURL.java b/opendj-server-legacy/src/main/java/org/opends/server/types/LDAPURL.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/LDAPURL.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/LDAPURL.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/LDIFExportConfig.java b/opendj-server-legacy/src/main/java/org/opends/server/types/LDIFExportConfig.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/LDIFExportConfig.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/LDIFExportConfig.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/LDIFImportConfig.java b/opendj-server-legacy/src/main/java/org/opends/server/types/LDIFImportConfig.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/LDIFImportConfig.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/LDIFImportConfig.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/LDIFImportResult.java b/opendj-server-legacy/src/main/java/org/opends/server/types/LDIFImportResult.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/LDIFImportResult.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/LDIFImportResult.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/LockManager.java b/opendj-server-legacy/src/main/java/org/opends/server/types/LockManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/LockManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/LockManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/LockType.java b/opendj-server-legacy/src/main/java/org/opends/server/types/LockType.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/LockType.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/LockType.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/MatchingRuleUse.java b/opendj-server-legacy/src/main/java/org/opends/server/types/MatchingRuleUse.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/MatchingRuleUse.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/MatchingRuleUse.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/MemberList.java b/opendj-server-legacy/src/main/java/org/opends/server/types/MemberList.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/MemberList.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/MemberList.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/MembershipException.java b/opendj-server-legacy/src/main/java/org/opends/server/types/MembershipException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/MembershipException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/MembershipException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/Modification.java b/opendj-server-legacy/src/main/java/org/opends/server/types/Modification.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/Modification.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/Modification.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/NameForm.java b/opendj-server-legacy/src/main/java/org/opends/server/types/NameForm.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/NameForm.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/NameForm.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/NamedCharacterSet.java b/opendj-server-legacy/src/main/java/org/opends/server/types/NamedCharacterSet.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/NamedCharacterSet.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/NamedCharacterSet.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/NullOutputStream.java b/opendj-server-legacy/src/main/java/org/opends/server/types/NullOutputStream.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/NullOutputStream.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/NullOutputStream.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/ObjectClass.java b/opendj-server-legacy/src/main/java/org/opends/server/types/ObjectClass.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/ObjectClass.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/ObjectClass.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/OpenDsException.java b/opendj-server-legacy/src/main/java/org/opends/server/types/OpenDsException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/OpenDsException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/OpenDsException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/Operation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/Operation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/Operation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/Operation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/OperationConfig.java b/opendj-server-legacy/src/main/java/org/opends/server/types/OperationConfig.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/OperationConfig.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/OperationConfig.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/OperationType.java b/opendj-server-legacy/src/main/java/org/opends/server/types/OperationType.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/OperationType.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/OperationType.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/Privilege.java b/opendj-server-legacy/src/main/java/org/opends/server/types/Privilege.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/Privilege.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/Privilege.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/PublicAPI.java b/opendj-server-legacy/src/main/java/org/opends/server/types/PublicAPI.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/PublicAPI.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/PublicAPI.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/RDN.java b/opendj-server-legacy/src/main/java/org/opends/server/types/RDN.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/RDN.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/RDN.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/RawAttribute.java b/opendj-server-legacy/src/main/java/org/opends/server/types/RawAttribute.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/RawAttribute.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/RawAttribute.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/RawFilter.java b/opendj-server-legacy/src/main/java/org/opends/server/types/RawFilter.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/RawFilter.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/RawFilter.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/RawModification.java b/opendj-server-legacy/src/main/java/org/opends/server/types/RawModification.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/RawModification.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/RawModification.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/RecordingInputStream.java b/opendj-server-legacy/src/main/java/org/opends/server/types/RecordingInputStream.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/RecordingInputStream.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/RecordingInputStream.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/RecordingOutputStream.java b/opendj-server-legacy/src/main/java/org/opends/server/types/RecordingOutputStream.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/RecordingOutputStream.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/RecordingOutputStream.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/RestoreConfig.java b/opendj-server-legacy/src/main/java/org/opends/server/types/RestoreConfig.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/RestoreConfig.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/RestoreConfig.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/SSLClientAuthPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/types/SSLClientAuthPolicy.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/SSLClientAuthPolicy.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/SSLClientAuthPolicy.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/Schema.java b/opendj-server-legacy/src/main/java/org/opends/server/types/Schema.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/Schema.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/Schema.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/SchemaFileElement.java b/opendj-server-legacy/src/main/java/org/opends/server/types/SchemaFileElement.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/SchemaFileElement.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/SchemaFileElement.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/SearchFilter.java b/opendj-server-legacy/src/main/java/org/opends/server/types/SearchFilter.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/SearchFilter.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/SearchFilter.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/SearchResultEntry.java b/opendj-server-legacy/src/main/java/org/opends/server/types/SearchResultEntry.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/SearchResultEntry.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/SearchResultEntry.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/SearchResultReference.java b/opendj-server-legacy/src/main/java/org/opends/server/types/SearchResultReference.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/SearchResultReference.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/SearchResultReference.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/SmallMap.java b/opendj-server-legacy/src/main/java/org/opends/server/types/SmallMap.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/SmallMap.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/SmallMap.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/SortKey.java b/opendj-server-legacy/src/main/java/org/opends/server/types/SortKey.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/SortKey.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/SortKey.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/SortOrder.java b/opendj-server-legacy/src/main/java/org/opends/server/types/SortOrder.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/SortOrder.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/SortOrder.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/StabilityLevel.java b/opendj-server-legacy/src/main/java/org/opends/server/types/StabilityLevel.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/StabilityLevel.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/StabilityLevel.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/SubEntry.java b/opendj-server-legacy/src/main/java/org/opends/server/types/SubEntry.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/SubEntry.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/SubEntry.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/SubtreeSpecification.java b/opendj-server-legacy/src/main/java/org/opends/server/types/SubtreeSpecification.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/SubtreeSpecification.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/SubtreeSpecification.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/SynchronizationProviderResult.java b/opendj-server-legacy/src/main/java/org/opends/server/types/SynchronizationProviderResult.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/SynchronizationProviderResult.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/SynchronizationProviderResult.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/VirtualAttribute.java b/opendj-server-legacy/src/main/java/org/opends/server/types/VirtualAttribute.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/VirtualAttribute.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/VirtualAttribute.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/VirtualAttributeRule.java b/opendj-server-legacy/src/main/java/org/opends/server/types/VirtualAttributeRule.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/VirtualAttributeRule.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/VirtualAttributeRule.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/WritabilityMode.java b/opendj-server-legacy/src/main/java/org/opends/server/types/WritabilityMode.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/WritabilityMode.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/WritabilityMode.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/InProgressOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/InProgressOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/InProgressOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/InProgressOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PluginOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PluginOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PluginOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PluginOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PostOperationAbandonOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationAbandonOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PostOperationAbandonOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationAbandonOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PostOperationAddOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationAddOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PostOperationAddOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationAddOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PostOperationBindOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationBindOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PostOperationBindOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationBindOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PostOperationCompareOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationCompareOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PostOperationCompareOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationCompareOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PostOperationDeleteOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationDeleteOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PostOperationDeleteOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationDeleteOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PostOperationExtendedOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationExtendedOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PostOperationExtendedOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationExtendedOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PostOperationModifyDNOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationModifyDNOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PostOperationModifyDNOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationModifyDNOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PostOperationModifyOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationModifyOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PostOperationModifyOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationModifyOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PostOperationOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PostOperationOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PostOperationSearchOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationSearchOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PostOperationSearchOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationSearchOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PostOperationUnbindOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationUnbindOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PostOperationUnbindOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationUnbindOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PostResponseAddOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseAddOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PostResponseAddOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseAddOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PostResponseBindOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseBindOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PostResponseBindOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseBindOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PostResponseCompareOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseCompareOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PostResponseCompareOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseCompareOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PostResponseDeleteOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseDeleteOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PostResponseDeleteOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseDeleteOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PostResponseExtendedOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseExtendedOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PostResponseExtendedOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseExtendedOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PostResponseModifyDNOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseModifyDNOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PostResponseModifyDNOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseModifyDNOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PostResponseModifyOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseModifyOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PostResponseModifyOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseModifyOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PostResponseOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PostResponseOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PostResponseSearchOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseSearchOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PostResponseSearchOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseSearchOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PostSynchronizationAddOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationAddOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PostSynchronizationAddOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationAddOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PostSynchronizationDeleteOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationDeleteOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PostSynchronizationDeleteOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationDeleteOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PostSynchronizationModifyDNOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationModifyDNOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PostSynchronizationModifyDNOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationModifyDNOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PostSynchronizationModifyOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationModifyOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PostSynchronizationModifyOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationModifyOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PostSynchronizationOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PostSynchronizationOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PreOperationAddOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationAddOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PreOperationAddOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationAddOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PreOperationBindOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationBindOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PreOperationBindOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationBindOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PreOperationCompareOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationCompareOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PreOperationCompareOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationCompareOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PreOperationDeleteOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationDeleteOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PreOperationDeleteOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationDeleteOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PreOperationExtendedOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationExtendedOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PreOperationExtendedOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationExtendedOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PreOperationModifyDNOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationModifyDNOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PreOperationModifyDNOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationModifyDNOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PreOperationModifyOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationModifyOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PreOperationModifyOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationModifyOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PreOperationOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PreOperationOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PreOperationSearchOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationSearchOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PreOperationSearchOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationSearchOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PreParseAbandonOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseAbandonOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PreParseAbandonOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseAbandonOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PreParseAddOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseAddOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PreParseAddOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseAddOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PreParseBindOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseBindOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PreParseBindOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseBindOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PreParseCompareOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseCompareOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PreParseCompareOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseCompareOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PreParseDeleteOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseDeleteOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PreParseDeleteOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseDeleteOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PreParseExtendedOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseExtendedOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PreParseExtendedOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseExtendedOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PreParseModifyDNOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseModifyDNOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PreParseModifyDNOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseModifyDNOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PreParseModifyOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseModifyOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PreParseModifyOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseModifyOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PreParseOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PreParseOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PreParseSearchOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseSearchOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PreParseSearchOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseSearchOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/PreParseUnbindOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseUnbindOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/PreParseUnbindOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseUnbindOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/SearchEntrySearchOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/SearchEntrySearchOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/SearchEntrySearchOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/SearchEntrySearchOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/SearchReferenceSearchOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/SearchReferenceSearchOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/SearchReferenceSearchOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/SearchReferenceSearchOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/SubordinateModifyDNOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/SubordinateModifyDNOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/SubordinateModifyDNOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/SubordinateModifyDNOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/operation/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/operation/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/operation/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/types/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/types/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/types/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/types/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/util/AddChangeRecordEntry.java b/opendj-server-legacy/src/main/java/org/opends/server/util/AddChangeRecordEntry.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/util/AddChangeRecordEntry.java
rename to opendj-server-legacy/src/main/java/org/opends/server/util/AddChangeRecordEntry.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/util/BSDMD5Crypt.java b/opendj-server-legacy/src/main/java/org/opends/server/util/BSDMD5Crypt.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/util/BSDMD5Crypt.java
rename to opendj-server-legacy/src/main/java/org/opends/server/util/BSDMD5Crypt.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/util/Base64.java b/opendj-server-legacy/src/main/java/org/opends/server/util/Base64.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/util/Base64.java
rename to opendj-server-legacy/src/main/java/org/opends/server/util/Base64.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/util/BuildVersion.java b/opendj-server-legacy/src/main/java/org/opends/server/util/BuildVersion.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/util/BuildVersion.java
rename to opendj-server-legacy/src/main/java/org/opends/server/util/BuildVersion.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/util/CertificateManager.java b/opendj-server-legacy/src/main/java/org/opends/server/util/CertificateManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/util/CertificateManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/util/CertificateManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/util/ChangeOperationType.java b/opendj-server-legacy/src/main/java/org/opends/server/util/ChangeOperationType.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/util/ChangeOperationType.java
rename to opendj-server-legacy/src/main/java/org/opends/server/util/ChangeOperationType.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/util/ChangeRecordEntry.java b/opendj-server-legacy/src/main/java/org/opends/server/util/ChangeRecordEntry.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/util/ChangeRecordEntry.java
rename to opendj-server-legacy/src/main/java/org/opends/server/util/ChangeRecordEntry.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/util/CollectionUtils.java b/opendj-server-legacy/src/main/java/org/opends/server/util/CollectionUtils.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/util/CollectionUtils.java
rename to opendj-server-legacy/src/main/java/org/opends/server/util/CollectionUtils.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/util/Crypt.java b/opendj-server-legacy/src/main/java/org/opends/server/util/Crypt.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/util/Crypt.java
rename to opendj-server-legacy/src/main/java/org/opends/server/util/Crypt.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/util/DeleteChangeRecordEntry.java b/opendj-server-legacy/src/main/java/org/opends/server/util/DeleteChangeRecordEntry.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/util/DeleteChangeRecordEntry.java
rename to opendj-server-legacy/src/main/java/org/opends/server/util/DeleteChangeRecordEntry.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/util/EMailMessage.java b/opendj-server-legacy/src/main/java/org/opends/server/util/EMailMessage.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/util/EMailMessage.java
rename to opendj-server-legacy/src/main/java/org/opends/server/util/EMailMessage.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/util/EmbeddedUtils.java b/opendj-server-legacy/src/main/java/org/opends/server/util/EmbeddedUtils.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/util/EmbeddedUtils.java
rename to opendj-server-legacy/src/main/java/org/opends/server/util/EmbeddedUtils.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/util/ExpirationCheckTrustManager.java b/opendj-server-legacy/src/main/java/org/opends/server/util/ExpirationCheckTrustManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/util/ExpirationCheckTrustManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/util/ExpirationCheckTrustManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/util/LDIFException.java b/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFException.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/util/LDIFException.java
rename to opendj-server-legacy/src/main/java/org/opends/server/util/LDIFException.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/util/LDIFReader.java b/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFReader.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/util/LDIFReader.java
rename to opendj-server-legacy/src/main/java/org/opends/server/util/LDIFReader.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/util/LDIFWriter.java b/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFWriter.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/util/LDIFWriter.java
rename to opendj-server-legacy/src/main/java/org/opends/server/util/LDIFWriter.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/util/LevenshteinDistance.java b/opendj-server-legacy/src/main/java/org/opends/server/util/LevenshteinDistance.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/util/LevenshteinDistance.java
rename to opendj-server-legacy/src/main/java/org/opends/server/util/LevenshteinDistance.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/util/ModifyChangeRecordEntry.java b/opendj-server-legacy/src/main/java/org/opends/server/util/ModifyChangeRecordEntry.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/util/ModifyChangeRecordEntry.java
rename to opendj-server-legacy/src/main/java/org/opends/server/util/ModifyChangeRecordEntry.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/util/ModifyDNChangeRecordEntry.java b/opendj-server-legacy/src/main/java/org/opends/server/util/ModifyDNChangeRecordEntry.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/util/ModifyDNChangeRecordEntry.java
rename to opendj-server-legacy/src/main/java/org/opends/server/util/ModifyDNChangeRecordEntry.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/util/MultiOutputStream.java b/opendj-server-legacy/src/main/java/org/opends/server/util/MultiOutputStream.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/util/MultiOutputStream.java
rename to opendj-server-legacy/src/main/java/org/opends/server/util/MultiOutputStream.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/util/Platform.java b/opendj-server-legacy/src/main/java/org/opends/server/util/Platform.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/util/Platform.java
rename to opendj-server-legacy/src/main/java/org/opends/server/util/Platform.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/util/RuntimeInformation.java b/opendj-server-legacy/src/main/java/org/opends/server/util/RuntimeInformation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/util/RuntimeInformation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/util/RuntimeInformation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/util/SelectableCertificateKeyManager.java b/opendj-server-legacy/src/main/java/org/opends/server/util/SelectableCertificateKeyManager.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/util/SelectableCertificateKeyManager.java
rename to opendj-server-legacy/src/main/java/org/opends/server/util/SelectableCertificateKeyManager.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/util/ServerConstants.java b/opendj-server-legacy/src/main/java/org/opends/server/util/ServerConstants.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/util/ServerConstants.java
rename to opendj-server-legacy/src/main/java/org/opends/server/util/ServerConstants.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/util/SetupUtils.java b/opendj-server-legacy/src/main/java/org/opends/server/util/SetupUtils.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/util/SetupUtils.java
rename to opendj-server-legacy/src/main/java/org/opends/server/util/SetupUtils.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/util/SizeLimitInputStream.java b/opendj-server-legacy/src/main/java/org/opends/server/util/SizeLimitInputStream.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/util/SizeLimitInputStream.java
rename to opendj-server-legacy/src/main/java/org/opends/server/util/SizeLimitInputStream.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/util/StaticUtils.java b/opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/util/StaticUtils.java
rename to opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/util/TimeThread.java b/opendj-server-legacy/src/main/java/org/opends/server/util/TimeThread.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/util/TimeThread.java
rename to opendj-server-legacy/src/main/java/org/opends/server/util/TimeThread.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/util/VersionCompatibilityIssue.java b/opendj-server-legacy/src/main/java/org/opends/server/util/VersionCompatibilityIssue.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/util/VersionCompatibilityIssue.java
rename to opendj-server-legacy/src/main/java/org/opends/server/util/VersionCompatibilityIssue.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/util/args/LDAPConnectionArgumentParser.java b/opendj-server-legacy/src/main/java/org/opends/server/util/args/LDAPConnectionArgumentParser.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/util/args/LDAPConnectionArgumentParser.java
rename to opendj-server-legacy/src/main/java/org/opends/server/util/args/LDAPConnectionArgumentParser.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/util/args/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/util/args/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/util/args/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/util/args/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java b/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
rename to opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/util/cli/PointAdder.java b/opendj-server-legacy/src/main/java/org/opends/server/util/cli/PointAdder.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/util/cli/PointAdder.java
rename to opendj-server-legacy/src/main/java/org/opends/server/util/cli/PointAdder.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/util/cli/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/util/cli/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/util/cli/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/util/cli/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/util/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/util/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/util/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/util/package-info.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/workflowelement/localbackend/LocalBackendCompareOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendCompareOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/workflowelement/localbackend/LocalBackendCompareOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendCompareOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java
rename to opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java b/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java
rename to opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java
diff --git a/opendj-server-legacy/src/server/org/opends/server/workflowelement/localbackend/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/package-info.java
similarity index 100%
rename from opendj-server-legacy/src/server/org/opends/server/workflowelement/localbackend/package-info.java
rename to opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/package-info.java

--
Gitblit v1.10.0