From 07f6878ac9121a91ea3cdb731b657574479665b2 Mon Sep 17 00:00:00 2001 From: Dennis Oelkers Date: Tue, 11 Jun 2019 15:22:09 +0200 Subject: [PATCH] Moving Java files into place. --- .../main/java/org/graylog/plugins/enterprise/ESBackendModule.java | 0 .../java/org/graylog/plugins/enterprise/EnterpriseConfig.java | 0 .../src/main/java/org/graylog/plugins/enterprise/Requirement.java | 0 .../main/java/org/graylog/plugins/enterprise/Requirements.java | 0 .../src/main/java/org/graylog/plugins/enterprise/ViewsModule.java | 0 .../plugins/enterprise/audit/EnterpriseAuditEventTypes.java | 0 .../enterprise/migrations/V20180817120900_AddViewsUsers.java | 0 .../enterprise/migrations/V20181220133700_AddViewsAdminRole.java | 0 .../migrations/V20190304102700_MigrateMessageListStructure.java | 0 .../main/java/org/graylog/plugins/enterprise/search/Filter.java | 0 .../java/org/graylog/plugins/enterprise/search/Parameter.java | 0 .../main/java/org/graylog/plugins/enterprise/search/Query.java | 0 .../java/org/graylog/plugins/enterprise/search/QueryMetadata.java | 0 .../java/org/graylog/plugins/enterprise/search/QueryResult.java | 0 .../main/java/org/graylog/plugins/enterprise/search/Search.java | 0 .../java/org/graylog/plugins/enterprise/search/SearchJob.java | 0 .../org/graylog/plugins/enterprise/search/SearchMetadata.java | 0 .../org/graylog/plugins/enterprise/search/SearchRequirements.java | 0 .../plugins/enterprise/search/SearchRequiresParameterSupport.java | 0 .../java/org/graylog/plugins/enterprise/search/SearchType.java | 0 .../plugins/enterprise/search/db/InMemorySearchJobService.java | 0 .../org/graylog/plugins/enterprise/search/db/SearchDbService.java | 0 .../graylog/plugins/enterprise/search/db/SearchJobService.java | 0 .../graylog/plugins/enterprise/search/db/SearchesCleanUpJob.java | 0 .../enterprise/search/elasticsearch/ESGeneratedQueryContext.java | 0 .../plugins/enterprise/search/elasticsearch/ESQueryDecorator.java | 0 .../enterprise/search/elasticsearch/ESQueryDecorators.java | 0 .../enterprise/search/elasticsearch/ElasticsearchQueryString.java | 0 .../search/elasticsearch/IndexRangeContainsOneOfStreams.java | 0 .../enterprise/search/elasticsearch/QueryMetadataDecorator.java | 0 .../enterprise/search/elasticsearch/QueryStringParser.java | 0 .../search/elasticsearch/searchtypes/ESDateHistogram.java | 0 .../search/elasticsearch/searchtypes/ESFieldMetric.java | 0 .../enterprise/search/elasticsearch/searchtypes/ESGroupBy.java | 0 .../search/elasticsearch/searchtypes/ESGroupByHistogram.java | 0 .../search/elasticsearch/searchtypes/ESMessageList.java | 0 .../search/elasticsearch/searchtypes/ESSearchTypeHandler.java | 0 .../search/elasticsearch/searchtypes/IntervalHelper.java | 0 .../search/elasticsearch/searchtypes/pivot/ESPivot.java | 0 .../elasticsearch/searchtypes/pivot/ESPivotBucketSpecHandler.java | 0 .../elasticsearch/searchtypes/pivot/ESPivotSeriesSpecHandler.java | 0 .../elasticsearch/searchtypes/pivot/buckets/ESTimeHandler.java | 0 .../elasticsearch/searchtypes/pivot/buckets/ESValuesHandler.java | 0 .../elasticsearch/searchtypes/pivot/series/ESAverageHandler.java | 0 .../searchtypes/pivot/series/ESCardinalityHandler.java | 0 .../elasticsearch/searchtypes/pivot/series/ESCountHandler.java | 0 .../elasticsearch/searchtypes/pivot/series/ESMaxHandler.java | 0 .../elasticsearch/searchtypes/pivot/series/ESMinHandler.java | 0 .../searchtypes/pivot/series/ESPercentilesHandler.java | 0 .../elasticsearch/searchtypes/pivot/series/ESStdDevHandler.java | 0 .../elasticsearch/searchtypes/pivot/series/ESSumHandler.java | 0 .../searchtypes/pivot/series/ESSumOfSquaresHandler.java | 0 .../elasticsearch/searchtypes/pivot/series/ESVarianceHandler.java | 0 .../graylog/plugins/enterprise/search/engine/BackendQuery.java | 0 .../graylog/plugins/enterprise/search/engine/EmptyTimeRange.java | 0 .../plugins/enterprise/search/engine/GeneratedQueryContext.java | 0 .../graylog/plugins/enterprise/search/engine/QueryBackend.java | 0 .../org/graylog/plugins/enterprise/search/engine/QueryEngine.java | 0 .../plugins/enterprise/search/engine/QueryExecutionStats.java | 0 .../graylog/plugins/enterprise/search/engine/QueryGenerator.java | 0 .../org/graylog/plugins/enterprise/search/engine/QueryPlan.java | 0 .../plugins/enterprise/search/engine/SearchTypeHandler.java | 0 .../org/graylog/plugins/enterprise/search/errors/QueryError.java | 0 .../org/graylog/plugins/enterprise/search/errors/SearchError.java | 0 .../graylog/plugins/enterprise/search/errors/SearchException.java | 0 .../graylog/plugins/enterprise/search/errors/SearchTypeError.java | 0 .../plugins/enterprise/search/errors/UnboundParameterError.java | 0 .../org/graylog/plugins/enterprise/search/filter/AndFilter.java | 0 .../org/graylog/plugins/enterprise/search/filter/OrFilter.java | 0 .../plugins/enterprise/search/filter/QueryStringFilter.java | 0 .../graylog/plugins/enterprise/search/filter/StreamFilter.java | 0 .../enterprise/search/rest/EnterpriseSearchRestPermissions.java | 0 .../enterprise/search/rest/FieldTypesForStreamsRequest.java | 0 .../plugins/enterprise/search/rest/FieldTypesResource.java | 0 .../plugins/enterprise/search/rest/MappedFieldTypeDTO.java | 0 .../enterprise/search/rest/PivotSeriesFunctionsResource.java | 0 .../plugins/enterprise/search/rest/QualifyingViewsResource.java | 0 .../graylog/plugins/enterprise/search/rest/SearchResource.java | 0 .../graylog/plugins/enterprise/search/rest/SeriesDescription.java | 0 .../plugins/enterprise/search/rest/ViewSharingResource.java | 0 .../org/graylog/plugins/enterprise/search/rest/ViewsResource.java | 0 .../plugins/enterprise/search/searchtypes/DateHistogram.java | 0 .../plugins/enterprise/search/searchtypes/FieldMetric.java | 0 .../graylog/plugins/enterprise/search/searchtypes/GroupBy.java | 0 .../plugins/enterprise/search/searchtypes/GroupByHistogram.java | 0 .../plugins/enterprise/search/searchtypes/MessageList.java | 0 .../org/graylog/plugins/enterprise/search/searchtypes/Sort.java | 0 .../plugins/enterprise/search/searchtypes/pivot/BucketSpec.java | 0 .../enterprise/search/searchtypes/pivot/BucketSpecHandler.java | 0 .../plugins/enterprise/search/searchtypes/pivot/Pivot.java | 0 .../plugins/enterprise/search/searchtypes/pivot/PivotResult.java | 0 .../plugins/enterprise/search/searchtypes/pivot/PivotSort.java | 0 .../plugins/enterprise/search/searchtypes/pivot/PivotSpec.java | 0 .../enterprise/search/searchtypes/pivot/PivotSpecHandler.java | 0 .../plugins/enterprise/search/searchtypes/pivot/SeriesSort.java | 0 .../plugins/enterprise/search/searchtypes/pivot/SeriesSpec.java | 0 .../enterprise/search/searchtypes/pivot/SeriesSpecHandler.java | 0 .../plugins/enterprise/search/searchtypes/pivot/SortSpec.java | 0 .../plugins/enterprise/search/searchtypes/pivot/TypedBuilder.java | 0 .../enterprise/search/searchtypes/pivot/buckets/AutoInterval.java | 0 .../enterprise/search/searchtypes/pivot/buckets/Interval.java | 0 .../plugins/enterprise/search/searchtypes/pivot/buckets/Time.java | 0 .../search/searchtypes/pivot/buckets/TimeUnitInterval.java | 0 .../enterprise/search/searchtypes/pivot/buckets/Values.java | 0 .../enterprise/search/searchtypes/pivot/series/Average.java | 0 .../enterprise/search/searchtypes/pivot/series/Cardinality.java | 0 .../plugins/enterprise/search/searchtypes/pivot/series/Count.java | 0 .../plugins/enterprise/search/searchtypes/pivot/series/Max.java | 0 .../plugins/enterprise/search/searchtypes/pivot/series/Min.java | 0 .../enterprise/search/searchtypes/pivot/series/Percentile.java | 0 .../enterprise/search/searchtypes/pivot/series/StdDev.java | 0 .../plugins/enterprise/search/searchtypes/pivot/series/Sum.java | 0 .../enterprise/search/searchtypes/pivot/series/SumOfSquares.java | 0 .../enterprise/search/searchtypes/pivot/series/Variance.java | 0 .../org/graylog/plugins/enterprise/search/util/GraphToDot.java | 0 .../org/graylog/plugins/enterprise/search/util/UniqueNamer.java | 0 .../plugins/enterprise/search/views/DashboardWidgetDTO.java | 0 .../enterprise/search/views/EnterpriseMetadataSummary.java | 0 .../plugins/enterprise/search/views/FormattingSettings.java | 0 .../plugins/enterprise/search/views/PluginMetadataSummary.java | 0 .../org/graylog/plugins/enterprise/search/views/Position.java | 0 .../plugins/enterprise/search/views/QualifyingViewsService.java | 0 .../plugins/enterprise/search/views/RequiresParameterSupport.java | 0 .../plugins/enterprise/search/views/VersionSerializer.java | 0 .../plugins/enterprise/search/views/ViewClusterConfig.java | 0 .../java/org/graylog/plugins/enterprise/search/views/ViewDTO.java | 0 .../plugins/enterprise/search/views/ViewDashboardStateDTO.java | 0 .../plugins/enterprise/search/views/ViewParameterSummaryDTO.java | 0 .../graylog/plugins/enterprise/search/views/ViewRequirements.java | 0 .../org/graylog/plugins/enterprise/search/views/ViewService.java | 0 .../org/graylog/plugins/enterprise/search/views/ViewStateDTO.java | 0 .../graylog/plugins/enterprise/search/views/WidgetConfigDTO.java | 0 .../org/graylog/plugins/enterprise/search/views/WidgetDTO.java | 0 .../plugins/enterprise/search/views/WidgetPositionDTO.java | 0 .../search/views/formatting/highlighting/HighlightingRule.java | 0 .../enterprise/search/views/sharing/AllUsersOfInstance.java | 0 .../search/views/sharing/AllUsersOfInstanceStrategy.java | 0 .../enterprise/search/views/sharing/IsViewSharedForUser.java | 0 .../plugins/enterprise/search/views/sharing/SharingStrategy.java | 0 .../plugins/enterprise/search/views/sharing/SpecificRoles.java | 0 .../enterprise/search/views/sharing/SpecificRolesStrategy.java | 0 .../plugins/enterprise/search/views/sharing/SpecificUsers.java | 0 .../enterprise/search/views/sharing/SpecificUsersStrategy.java | 0 .../plugins/enterprise/search/views/sharing/UserShortSummary.java | 0 .../plugins/enterprise/search/views/sharing/ViewSharing.java | 0 .../enterprise/search/views/sharing/ViewSharingService.java | 0 .../search/views/widgets/aggregation/AggregationConfigDTO.java | 0 .../search/views/widgets/aggregation/AutoIntervalDTO.java | 0 .../views/widgets/aggregation/BarVisualizationConfigDTO.java | 0 .../enterprise/search/views/widgets/aggregation/ChartColor.java | 0 .../enterprise/search/views/widgets/aggregation/IntervalDTO.java | 0 .../search/views/widgets/aggregation/PivotConfigDTO.java | 0 .../enterprise/search/views/widgets/aggregation/PivotDTO.java | 0 .../search/views/widgets/aggregation/SeriesConfigDTO.java | 0 .../enterprise/search/views/widgets/aggregation/SeriesDTO.java | 0 .../search/views/widgets/aggregation/TimeHistogramConfigDTO.java | 0 .../search/views/widgets/aggregation/TimeUnitIntervalDTO.java | 0 .../search/views/widgets/aggregation/ValueConfigDTO.java | 0 .../enterprise/search/views/widgets/aggregation/Viewport.java | 0 .../search/views/widgets/aggregation/VisualizationConfigDTO.java | 0 .../views/widgets/aggregation/WidgetFormattingSettings.java | 0 .../views/widgets/aggregation/WorldMapVisualizationConfigDTO.java | 0 .../search/views/widgets/aggregation/sort/PivotSortConfig.java | 0 .../search/views/widgets/aggregation/sort/SeriesSortConfig.java | 0 .../search/views/widgets/aggregation/sort/SortConfigDTO.java | 0 .../search/views/widgets/messagelist/MessageListConfigDTO.java | 0 .../V20190304102700_MigrateMessageListStructureTest.java | 0 .../java/org/graylog/plugins/enterprise/search/QueryTest.java | 0 .../enterprise/search/db/InMemorySearchJobServiceTest.java | 0 .../plugins/enterprise/search/db/SearchesCleanUpJobTest.java | 0 .../search/db/SearchesCleanUpJobWithDBServicesTest.java | 0 .../ElasticsearchBackendGeneratedRequestTestBase.java | 0 .../search/elasticsearch/ElasticsearchBackendMultiSearchTest.java | 0 .../enterprise/search/elasticsearch/ElasticsearchBackendTest.java | 0 .../search/elasticsearch/ElasticsearchBackendTestBase.java | 0 .../ElasticsearchBackendUsingCorrectIndicesTest.java | 0 .../search/elasticsearch/IndexRangeContainsOneOfStreamsTest.java | 0 .../search/elasticsearch/searchtypes/ESMessageListTest.java | 0 .../search/elasticsearch/searchtypes/pivot/ESPivotTest.java | 0 .../graylog/plugins/enterprise/search/engine/QueryPlanTest.java | 0 .../enterprise/search/rest/QualifyingViewsResourceTest.java | 0 .../enterprise/search/rest/SearchResourcePermissionsTest.java | 0 .../search/rest/SearchResourceStreamPermissionsTest.java | 0 .../plugins/enterprise/search/rest/SearchResourceTest.java | 0 .../plugins/enterprise/search/rest/ViewSharingResourceTest.java | 0 .../graylog/plugins/enterprise/search/rest/ViewsResourceTest.java | 0 .../searchtypes/pivot/buckets/AutoIntervalBoundariesTest.java | 0 .../search/searchtypes/pivot/buckets/AutoIntervalTest.java | 0 .../enterprise/search/views/QualifyingViewsServiceTest.java | 0 .../enterprise/search/views/RequiresParameterSupportTest.java | 0 .../plugins/enterprise/search/views/ViewRequirementsTest.java | 0 .../graylog/plugins/enterprise/search/views/ViewServiceTest.java | 0 .../search/views/ViewServiceUsesViewRequirementsTest.java | 0 193 files changed, 0 insertions(+), 0 deletions(-) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/ESBackendModule.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/EnterpriseConfig.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/Requirement.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/Requirements.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/ViewsModule.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/audit/EnterpriseAuditEventTypes.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/migrations/V20180817120900_AddViewsUsers.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/migrations/V20181220133700_AddViewsAdminRole.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/migrations/V20190304102700_MigrateMessageListStructure.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/Filter.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/Parameter.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/Query.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/QueryMetadata.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/QueryResult.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/Search.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/SearchJob.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/SearchMetadata.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/SearchRequirements.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/SearchRequiresParameterSupport.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/SearchType.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/db/InMemorySearchJobService.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/db/SearchDbService.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/db/SearchJobService.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/db/SearchesCleanUpJob.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/ESGeneratedQueryContext.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/ESQueryDecorator.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/ESQueryDecorators.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/ElasticsearchQueryString.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/IndexRangeContainsOneOfStreams.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/QueryMetadataDecorator.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/QueryStringParser.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/ESDateHistogram.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/ESFieldMetric.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/ESGroupBy.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/ESGroupByHistogram.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/ESMessageList.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/ESSearchTypeHandler.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/IntervalHelper.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/ESPivot.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/ESPivotBucketSpecHandler.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/ESPivotSeriesSpecHandler.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/buckets/ESTimeHandler.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/buckets/ESValuesHandler.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESAverageHandler.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESCardinalityHandler.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESCountHandler.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESMaxHandler.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESMinHandler.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESPercentilesHandler.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESStdDevHandler.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESSumHandler.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESSumOfSquaresHandler.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESVarianceHandler.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/engine/BackendQuery.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/engine/EmptyTimeRange.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/engine/GeneratedQueryContext.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/engine/QueryBackend.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/engine/QueryEngine.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/engine/QueryExecutionStats.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/engine/QueryGenerator.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/engine/QueryPlan.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/engine/SearchTypeHandler.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/errors/QueryError.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/errors/SearchError.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/errors/SearchException.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/errors/SearchTypeError.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/errors/UnboundParameterError.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/filter/AndFilter.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/filter/OrFilter.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/filter/QueryStringFilter.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/filter/StreamFilter.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/rest/EnterpriseSearchRestPermissions.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/rest/FieldTypesForStreamsRequest.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/rest/FieldTypesResource.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/rest/MappedFieldTypeDTO.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/rest/PivotSeriesFunctionsResource.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/rest/QualifyingViewsResource.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/rest/SearchResource.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/rest/SeriesDescription.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/rest/ViewSharingResource.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/rest/ViewsResource.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/DateHistogram.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/FieldMetric.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/GroupBy.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/GroupByHistogram.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/MessageList.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/Sort.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/BucketSpec.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/BucketSpecHandler.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/Pivot.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/PivotResult.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/PivotSort.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/PivotSpec.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/PivotSpecHandler.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/SeriesSort.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/SeriesSpec.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/SeriesSpecHandler.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/SortSpec.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/TypedBuilder.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/buckets/AutoInterval.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/buckets/Interval.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/buckets/Time.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/buckets/TimeUnitInterval.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/buckets/Values.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Average.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Cardinality.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Count.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Max.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Min.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Percentile.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/StdDev.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Sum.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/SumOfSquares.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Variance.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/util/GraphToDot.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/util/UniqueNamer.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/DashboardWidgetDTO.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/EnterpriseMetadataSummary.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/FormattingSettings.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/PluginMetadataSummary.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/Position.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/QualifyingViewsService.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/RequiresParameterSupport.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/VersionSerializer.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/ViewClusterConfig.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/ViewDTO.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/ViewDashboardStateDTO.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/ViewParameterSummaryDTO.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/ViewRequirements.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/ViewService.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/ViewStateDTO.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/WidgetConfigDTO.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/WidgetDTO.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/WidgetPositionDTO.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/formatting/highlighting/HighlightingRule.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/AllUsersOfInstance.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/AllUsersOfInstanceStrategy.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/IsViewSharedForUser.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/SharingStrategy.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/SpecificRoles.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/SpecificRolesStrategy.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/SpecificUsers.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/SpecificUsersStrategy.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/UserShortSummary.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/ViewSharing.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/ViewSharingService.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/AggregationConfigDTO.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/AutoIntervalDTO.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/BarVisualizationConfigDTO.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/ChartColor.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/IntervalDTO.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/PivotConfigDTO.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/PivotDTO.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/SeriesConfigDTO.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/SeriesDTO.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/TimeHistogramConfigDTO.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/TimeUnitIntervalDTO.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/ValueConfigDTO.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/Viewport.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/VisualizationConfigDTO.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/WidgetFormattingSettings.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/WorldMapVisualizationConfigDTO.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/sort/PivotSortConfig.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/sort/SeriesSortConfig.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/sort/SortConfigDTO.java (100%) rename {enterprise => graylog2-server}/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/messagelist/MessageListConfigDTO.java (100%) rename {enterprise => graylog2-server}/src/test/java/org/graylog/plugins/enterprise/migration/V20190304102700_MigrateMessageListStructureTest.java (100%) rename {enterprise => graylog2-server}/src/test/java/org/graylog/plugins/enterprise/search/QueryTest.java (100%) rename {enterprise => graylog2-server}/src/test/java/org/graylog/plugins/enterprise/search/db/InMemorySearchJobServiceTest.java (100%) rename {enterprise => graylog2-server}/src/test/java/org/graylog/plugins/enterprise/search/db/SearchesCleanUpJobTest.java (100%) rename {enterprise => graylog2-server}/src/test/java/org/graylog/plugins/enterprise/search/db/SearchesCleanUpJobWithDBServicesTest.java (100%) rename {enterprise => graylog2-server}/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/ElasticsearchBackendGeneratedRequestTestBase.java (100%) rename {enterprise => graylog2-server}/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/ElasticsearchBackendMultiSearchTest.java (100%) rename {enterprise => graylog2-server}/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/ElasticsearchBackendTest.java (100%) rename {enterprise => graylog2-server}/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/ElasticsearchBackendTestBase.java (100%) rename {enterprise => graylog2-server}/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/ElasticsearchBackendUsingCorrectIndicesTest.java (100%) rename {enterprise => graylog2-server}/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/IndexRangeContainsOneOfStreamsTest.java (100%) rename {enterprise => graylog2-server}/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/ESMessageListTest.java (100%) rename {enterprise => graylog2-server}/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/ESPivotTest.java (100%) rename {enterprise => graylog2-server}/src/test/java/org/graylog/plugins/enterprise/search/engine/QueryPlanTest.java (100%) rename {enterprise => graylog2-server}/src/test/java/org/graylog/plugins/enterprise/search/rest/QualifyingViewsResourceTest.java (100%) rename {enterprise => graylog2-server}/src/test/java/org/graylog/plugins/enterprise/search/rest/SearchResourcePermissionsTest.java (100%) rename {enterprise => graylog2-server}/src/test/java/org/graylog/plugins/enterprise/search/rest/SearchResourceStreamPermissionsTest.java (100%) rename {enterprise => graylog2-server}/src/test/java/org/graylog/plugins/enterprise/search/rest/SearchResourceTest.java (100%) rename {enterprise => graylog2-server}/src/test/java/org/graylog/plugins/enterprise/search/rest/ViewSharingResourceTest.java (100%) rename {enterprise => graylog2-server}/src/test/java/org/graylog/plugins/enterprise/search/rest/ViewsResourceTest.java (100%) rename {enterprise => graylog2-server}/src/test/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/buckets/AutoIntervalBoundariesTest.java (100%) rename {enterprise => graylog2-server}/src/test/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/buckets/AutoIntervalTest.java (100%) rename {enterprise => graylog2-server}/src/test/java/org/graylog/plugins/enterprise/search/views/QualifyingViewsServiceTest.java (100%) rename {enterprise => graylog2-server}/src/test/java/org/graylog/plugins/enterprise/search/views/RequiresParameterSupportTest.java (100%) rename {enterprise => graylog2-server}/src/test/java/org/graylog/plugins/enterprise/search/views/ViewRequirementsTest.java (100%) rename {enterprise => graylog2-server}/src/test/java/org/graylog/plugins/enterprise/search/views/ViewServiceTest.java (100%) rename {enterprise => graylog2-server}/src/test/java/org/graylog/plugins/enterprise/search/views/ViewServiceUsesViewRequirementsTest.java (100%) diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/ESBackendModule.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/ESBackendModule.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/ESBackendModule.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/ESBackendModule.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/EnterpriseConfig.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/EnterpriseConfig.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/EnterpriseConfig.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/EnterpriseConfig.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/Requirement.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/Requirement.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/Requirement.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/Requirement.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/Requirements.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/Requirements.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/Requirements.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/Requirements.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/ViewsModule.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/ViewsModule.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/ViewsModule.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/ViewsModule.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/audit/EnterpriseAuditEventTypes.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/audit/EnterpriseAuditEventTypes.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/audit/EnterpriseAuditEventTypes.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/audit/EnterpriseAuditEventTypes.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/migrations/V20180817120900_AddViewsUsers.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/migrations/V20180817120900_AddViewsUsers.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/migrations/V20180817120900_AddViewsUsers.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/migrations/V20180817120900_AddViewsUsers.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/migrations/V20181220133700_AddViewsAdminRole.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/migrations/V20181220133700_AddViewsAdminRole.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/migrations/V20181220133700_AddViewsAdminRole.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/migrations/V20181220133700_AddViewsAdminRole.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/migrations/V20190304102700_MigrateMessageListStructure.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/migrations/V20190304102700_MigrateMessageListStructure.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/migrations/V20190304102700_MigrateMessageListStructure.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/migrations/V20190304102700_MigrateMessageListStructure.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/Filter.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/Filter.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/Filter.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/Filter.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/Parameter.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/Parameter.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/Parameter.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/Parameter.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/Query.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/Query.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/Query.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/Query.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/QueryMetadata.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/QueryMetadata.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/QueryMetadata.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/QueryMetadata.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/QueryResult.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/QueryResult.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/QueryResult.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/QueryResult.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/Search.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/Search.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/Search.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/Search.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/SearchJob.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/SearchJob.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/SearchJob.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/SearchJob.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/SearchMetadata.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/SearchMetadata.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/SearchMetadata.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/SearchMetadata.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/SearchRequirements.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/SearchRequirements.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/SearchRequirements.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/SearchRequirements.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/SearchRequiresParameterSupport.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/SearchRequiresParameterSupport.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/SearchRequiresParameterSupport.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/SearchRequiresParameterSupport.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/SearchType.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/SearchType.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/SearchType.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/SearchType.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/db/InMemorySearchJobService.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/db/InMemorySearchJobService.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/db/InMemorySearchJobService.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/db/InMemorySearchJobService.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/db/SearchDbService.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/db/SearchDbService.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/db/SearchDbService.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/db/SearchDbService.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/db/SearchJobService.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/db/SearchJobService.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/db/SearchJobService.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/db/SearchJobService.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/db/SearchesCleanUpJob.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/db/SearchesCleanUpJob.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/db/SearchesCleanUpJob.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/db/SearchesCleanUpJob.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/ESGeneratedQueryContext.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/ESGeneratedQueryContext.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/ESGeneratedQueryContext.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/ESGeneratedQueryContext.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/ESQueryDecorator.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/ESQueryDecorator.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/ESQueryDecorator.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/ESQueryDecorator.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/ESQueryDecorators.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/ESQueryDecorators.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/ESQueryDecorators.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/ESQueryDecorators.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/ElasticsearchQueryString.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/ElasticsearchQueryString.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/ElasticsearchQueryString.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/ElasticsearchQueryString.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/IndexRangeContainsOneOfStreams.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/IndexRangeContainsOneOfStreams.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/IndexRangeContainsOneOfStreams.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/IndexRangeContainsOneOfStreams.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/QueryMetadataDecorator.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/QueryMetadataDecorator.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/QueryMetadataDecorator.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/QueryMetadataDecorator.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/QueryStringParser.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/QueryStringParser.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/QueryStringParser.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/QueryStringParser.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/ESDateHistogram.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/ESDateHistogram.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/ESDateHistogram.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/ESDateHistogram.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/ESFieldMetric.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/ESFieldMetric.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/ESFieldMetric.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/ESFieldMetric.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/ESGroupBy.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/ESGroupBy.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/ESGroupBy.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/ESGroupBy.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/ESGroupByHistogram.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/ESGroupByHistogram.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/ESGroupByHistogram.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/ESGroupByHistogram.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/ESMessageList.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/ESMessageList.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/ESMessageList.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/ESMessageList.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/ESSearchTypeHandler.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/ESSearchTypeHandler.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/ESSearchTypeHandler.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/ESSearchTypeHandler.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/IntervalHelper.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/IntervalHelper.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/IntervalHelper.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/IntervalHelper.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/ESPivot.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/ESPivot.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/ESPivot.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/ESPivot.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/ESPivotBucketSpecHandler.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/ESPivotBucketSpecHandler.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/ESPivotBucketSpecHandler.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/ESPivotBucketSpecHandler.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/ESPivotSeriesSpecHandler.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/ESPivotSeriesSpecHandler.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/ESPivotSeriesSpecHandler.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/ESPivotSeriesSpecHandler.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/buckets/ESTimeHandler.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/buckets/ESTimeHandler.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/buckets/ESTimeHandler.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/buckets/ESTimeHandler.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/buckets/ESValuesHandler.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/buckets/ESValuesHandler.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/buckets/ESValuesHandler.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/buckets/ESValuesHandler.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESAverageHandler.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESAverageHandler.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESAverageHandler.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESAverageHandler.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESCardinalityHandler.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESCardinalityHandler.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESCardinalityHandler.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESCardinalityHandler.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESCountHandler.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESCountHandler.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESCountHandler.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESCountHandler.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESMaxHandler.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESMaxHandler.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESMaxHandler.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESMaxHandler.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESMinHandler.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESMinHandler.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESMinHandler.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESMinHandler.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESPercentilesHandler.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESPercentilesHandler.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESPercentilesHandler.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESPercentilesHandler.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESStdDevHandler.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESStdDevHandler.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESStdDevHandler.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESStdDevHandler.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESSumHandler.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESSumHandler.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESSumHandler.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESSumHandler.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESSumOfSquaresHandler.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESSumOfSquaresHandler.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESSumOfSquaresHandler.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESSumOfSquaresHandler.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESVarianceHandler.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESVarianceHandler.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESVarianceHandler.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/series/ESVarianceHandler.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/engine/BackendQuery.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/engine/BackendQuery.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/engine/BackendQuery.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/engine/BackendQuery.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/engine/EmptyTimeRange.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/engine/EmptyTimeRange.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/engine/EmptyTimeRange.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/engine/EmptyTimeRange.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/engine/GeneratedQueryContext.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/engine/GeneratedQueryContext.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/engine/GeneratedQueryContext.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/engine/GeneratedQueryContext.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/engine/QueryBackend.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/engine/QueryBackend.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/engine/QueryBackend.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/engine/QueryBackend.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/engine/QueryEngine.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/engine/QueryEngine.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/engine/QueryEngine.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/engine/QueryEngine.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/engine/QueryExecutionStats.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/engine/QueryExecutionStats.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/engine/QueryExecutionStats.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/engine/QueryExecutionStats.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/engine/QueryGenerator.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/engine/QueryGenerator.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/engine/QueryGenerator.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/engine/QueryGenerator.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/engine/QueryPlan.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/engine/QueryPlan.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/engine/QueryPlan.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/engine/QueryPlan.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/engine/SearchTypeHandler.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/engine/SearchTypeHandler.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/engine/SearchTypeHandler.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/engine/SearchTypeHandler.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/errors/QueryError.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/errors/QueryError.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/errors/QueryError.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/errors/QueryError.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/errors/SearchError.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/errors/SearchError.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/errors/SearchError.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/errors/SearchError.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/errors/SearchException.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/errors/SearchException.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/errors/SearchException.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/errors/SearchException.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/errors/SearchTypeError.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/errors/SearchTypeError.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/errors/SearchTypeError.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/errors/SearchTypeError.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/errors/UnboundParameterError.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/errors/UnboundParameterError.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/errors/UnboundParameterError.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/errors/UnboundParameterError.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/filter/AndFilter.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/filter/AndFilter.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/filter/AndFilter.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/filter/AndFilter.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/filter/OrFilter.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/filter/OrFilter.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/filter/OrFilter.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/filter/OrFilter.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/filter/QueryStringFilter.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/filter/QueryStringFilter.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/filter/QueryStringFilter.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/filter/QueryStringFilter.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/filter/StreamFilter.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/filter/StreamFilter.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/filter/StreamFilter.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/filter/StreamFilter.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/rest/EnterpriseSearchRestPermissions.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/rest/EnterpriseSearchRestPermissions.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/rest/EnterpriseSearchRestPermissions.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/rest/EnterpriseSearchRestPermissions.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/rest/FieldTypesForStreamsRequest.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/rest/FieldTypesForStreamsRequest.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/rest/FieldTypesForStreamsRequest.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/rest/FieldTypesForStreamsRequest.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/rest/FieldTypesResource.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/rest/FieldTypesResource.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/rest/FieldTypesResource.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/rest/FieldTypesResource.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/rest/MappedFieldTypeDTO.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/rest/MappedFieldTypeDTO.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/rest/MappedFieldTypeDTO.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/rest/MappedFieldTypeDTO.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/rest/PivotSeriesFunctionsResource.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/rest/PivotSeriesFunctionsResource.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/rest/PivotSeriesFunctionsResource.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/rest/PivotSeriesFunctionsResource.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/rest/QualifyingViewsResource.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/rest/QualifyingViewsResource.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/rest/QualifyingViewsResource.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/rest/QualifyingViewsResource.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/rest/SearchResource.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/rest/SearchResource.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/rest/SearchResource.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/rest/SearchResource.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/rest/SeriesDescription.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/rest/SeriesDescription.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/rest/SeriesDescription.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/rest/SeriesDescription.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/rest/ViewSharingResource.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/rest/ViewSharingResource.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/rest/ViewSharingResource.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/rest/ViewSharingResource.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/rest/ViewsResource.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/rest/ViewsResource.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/rest/ViewsResource.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/rest/ViewsResource.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/DateHistogram.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/DateHistogram.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/DateHistogram.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/DateHistogram.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/FieldMetric.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/FieldMetric.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/FieldMetric.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/FieldMetric.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/GroupBy.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/GroupBy.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/GroupBy.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/GroupBy.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/GroupByHistogram.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/GroupByHistogram.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/GroupByHistogram.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/GroupByHistogram.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/MessageList.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/MessageList.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/MessageList.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/MessageList.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/Sort.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/Sort.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/Sort.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/Sort.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/BucketSpec.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/BucketSpec.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/BucketSpec.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/BucketSpec.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/BucketSpecHandler.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/BucketSpecHandler.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/BucketSpecHandler.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/BucketSpecHandler.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/Pivot.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/Pivot.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/Pivot.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/Pivot.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/PivotResult.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/PivotResult.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/PivotResult.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/PivotResult.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/PivotSort.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/PivotSort.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/PivotSort.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/PivotSort.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/PivotSpec.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/PivotSpec.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/PivotSpec.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/PivotSpec.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/PivotSpecHandler.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/PivotSpecHandler.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/PivotSpecHandler.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/PivotSpecHandler.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/SeriesSort.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/SeriesSort.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/SeriesSort.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/SeriesSort.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/SeriesSpec.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/SeriesSpec.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/SeriesSpec.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/SeriesSpec.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/SeriesSpecHandler.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/SeriesSpecHandler.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/SeriesSpecHandler.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/SeriesSpecHandler.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/SortSpec.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/SortSpec.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/SortSpec.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/SortSpec.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/TypedBuilder.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/TypedBuilder.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/TypedBuilder.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/TypedBuilder.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/buckets/AutoInterval.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/buckets/AutoInterval.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/buckets/AutoInterval.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/buckets/AutoInterval.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/buckets/Interval.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/buckets/Interval.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/buckets/Interval.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/buckets/Interval.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/buckets/Time.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/buckets/Time.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/buckets/Time.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/buckets/Time.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/buckets/TimeUnitInterval.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/buckets/TimeUnitInterval.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/buckets/TimeUnitInterval.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/buckets/TimeUnitInterval.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/buckets/Values.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/buckets/Values.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/buckets/Values.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/buckets/Values.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Average.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Average.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Average.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Average.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Cardinality.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Cardinality.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Cardinality.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Cardinality.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Count.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Count.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Count.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Count.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Max.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Max.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Max.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Max.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Min.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Min.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Min.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Min.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Percentile.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Percentile.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Percentile.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Percentile.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/StdDev.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/StdDev.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/StdDev.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/StdDev.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Sum.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Sum.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Sum.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Sum.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/SumOfSquares.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/SumOfSquares.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/SumOfSquares.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/SumOfSquares.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Variance.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Variance.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Variance.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/series/Variance.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/util/GraphToDot.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/util/GraphToDot.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/util/GraphToDot.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/util/GraphToDot.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/util/UniqueNamer.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/util/UniqueNamer.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/util/UniqueNamer.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/util/UniqueNamer.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/DashboardWidgetDTO.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/DashboardWidgetDTO.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/DashboardWidgetDTO.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/DashboardWidgetDTO.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/EnterpriseMetadataSummary.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/EnterpriseMetadataSummary.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/EnterpriseMetadataSummary.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/EnterpriseMetadataSummary.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/FormattingSettings.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/FormattingSettings.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/FormattingSettings.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/FormattingSettings.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/PluginMetadataSummary.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/PluginMetadataSummary.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/PluginMetadataSummary.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/PluginMetadataSummary.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/Position.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/Position.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/Position.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/Position.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/QualifyingViewsService.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/QualifyingViewsService.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/QualifyingViewsService.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/QualifyingViewsService.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/RequiresParameterSupport.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/RequiresParameterSupport.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/RequiresParameterSupport.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/RequiresParameterSupport.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/VersionSerializer.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/VersionSerializer.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/VersionSerializer.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/VersionSerializer.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/ViewClusterConfig.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/ViewClusterConfig.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/ViewClusterConfig.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/ViewClusterConfig.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/ViewDTO.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/ViewDTO.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/ViewDTO.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/ViewDTO.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/ViewDashboardStateDTO.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/ViewDashboardStateDTO.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/ViewDashboardStateDTO.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/ViewDashboardStateDTO.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/ViewParameterSummaryDTO.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/ViewParameterSummaryDTO.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/ViewParameterSummaryDTO.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/ViewParameterSummaryDTO.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/ViewRequirements.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/ViewRequirements.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/ViewRequirements.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/ViewRequirements.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/ViewService.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/ViewService.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/ViewService.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/ViewService.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/ViewStateDTO.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/ViewStateDTO.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/ViewStateDTO.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/ViewStateDTO.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/WidgetConfigDTO.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/WidgetConfigDTO.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/WidgetConfigDTO.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/WidgetConfigDTO.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/WidgetDTO.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/WidgetDTO.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/WidgetDTO.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/WidgetDTO.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/WidgetPositionDTO.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/WidgetPositionDTO.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/WidgetPositionDTO.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/WidgetPositionDTO.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/formatting/highlighting/HighlightingRule.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/formatting/highlighting/HighlightingRule.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/formatting/highlighting/HighlightingRule.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/formatting/highlighting/HighlightingRule.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/AllUsersOfInstance.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/AllUsersOfInstance.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/AllUsersOfInstance.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/AllUsersOfInstance.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/AllUsersOfInstanceStrategy.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/AllUsersOfInstanceStrategy.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/AllUsersOfInstanceStrategy.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/AllUsersOfInstanceStrategy.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/IsViewSharedForUser.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/IsViewSharedForUser.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/IsViewSharedForUser.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/IsViewSharedForUser.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/SharingStrategy.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/SharingStrategy.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/SharingStrategy.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/SharingStrategy.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/SpecificRoles.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/SpecificRoles.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/SpecificRoles.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/SpecificRoles.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/SpecificRolesStrategy.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/SpecificRolesStrategy.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/SpecificRolesStrategy.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/SpecificRolesStrategy.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/SpecificUsers.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/SpecificUsers.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/SpecificUsers.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/SpecificUsers.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/SpecificUsersStrategy.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/SpecificUsersStrategy.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/SpecificUsersStrategy.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/SpecificUsersStrategy.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/UserShortSummary.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/UserShortSummary.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/UserShortSummary.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/UserShortSummary.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/ViewSharing.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/ViewSharing.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/ViewSharing.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/ViewSharing.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/ViewSharingService.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/ViewSharingService.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/ViewSharingService.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/sharing/ViewSharingService.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/AggregationConfigDTO.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/AggregationConfigDTO.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/AggregationConfigDTO.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/AggregationConfigDTO.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/AutoIntervalDTO.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/AutoIntervalDTO.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/AutoIntervalDTO.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/AutoIntervalDTO.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/BarVisualizationConfigDTO.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/BarVisualizationConfigDTO.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/BarVisualizationConfigDTO.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/BarVisualizationConfigDTO.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/ChartColor.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/ChartColor.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/ChartColor.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/ChartColor.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/IntervalDTO.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/IntervalDTO.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/IntervalDTO.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/IntervalDTO.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/PivotConfigDTO.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/PivotConfigDTO.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/PivotConfigDTO.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/PivotConfigDTO.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/PivotDTO.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/PivotDTO.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/PivotDTO.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/PivotDTO.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/SeriesConfigDTO.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/SeriesConfigDTO.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/SeriesConfigDTO.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/SeriesConfigDTO.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/SeriesDTO.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/SeriesDTO.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/SeriesDTO.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/SeriesDTO.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/TimeHistogramConfigDTO.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/TimeHistogramConfigDTO.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/TimeHistogramConfigDTO.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/TimeHistogramConfigDTO.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/TimeUnitIntervalDTO.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/TimeUnitIntervalDTO.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/TimeUnitIntervalDTO.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/TimeUnitIntervalDTO.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/ValueConfigDTO.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/ValueConfigDTO.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/ValueConfigDTO.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/ValueConfigDTO.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/Viewport.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/Viewport.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/Viewport.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/Viewport.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/VisualizationConfigDTO.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/VisualizationConfigDTO.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/VisualizationConfigDTO.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/VisualizationConfigDTO.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/WidgetFormattingSettings.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/WidgetFormattingSettings.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/WidgetFormattingSettings.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/WidgetFormattingSettings.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/WorldMapVisualizationConfigDTO.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/WorldMapVisualizationConfigDTO.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/WorldMapVisualizationConfigDTO.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/WorldMapVisualizationConfigDTO.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/sort/PivotSortConfig.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/sort/PivotSortConfig.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/sort/PivotSortConfig.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/sort/PivotSortConfig.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/sort/SeriesSortConfig.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/sort/SeriesSortConfig.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/sort/SeriesSortConfig.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/sort/SeriesSortConfig.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/sort/SortConfigDTO.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/sort/SortConfigDTO.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/sort/SortConfigDTO.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/aggregation/sort/SortConfigDTO.java diff --git a/enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/messagelist/MessageListConfigDTO.java b/graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/messagelist/MessageListConfigDTO.java similarity index 100% rename from enterprise/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/messagelist/MessageListConfigDTO.java rename to graylog2-server/src/main/java/org/graylog/plugins/enterprise/search/views/widgets/messagelist/MessageListConfigDTO.java diff --git a/enterprise/src/test/java/org/graylog/plugins/enterprise/migration/V20190304102700_MigrateMessageListStructureTest.java b/graylog2-server/src/test/java/org/graylog/plugins/enterprise/migration/V20190304102700_MigrateMessageListStructureTest.java similarity index 100% rename from enterprise/src/test/java/org/graylog/plugins/enterprise/migration/V20190304102700_MigrateMessageListStructureTest.java rename to graylog2-server/src/test/java/org/graylog/plugins/enterprise/migration/V20190304102700_MigrateMessageListStructureTest.java diff --git a/enterprise/src/test/java/org/graylog/plugins/enterprise/search/QueryTest.java b/graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/QueryTest.java similarity index 100% rename from enterprise/src/test/java/org/graylog/plugins/enterprise/search/QueryTest.java rename to graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/QueryTest.java diff --git a/enterprise/src/test/java/org/graylog/plugins/enterprise/search/db/InMemorySearchJobServiceTest.java b/graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/db/InMemorySearchJobServiceTest.java similarity index 100% rename from enterprise/src/test/java/org/graylog/plugins/enterprise/search/db/InMemorySearchJobServiceTest.java rename to graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/db/InMemorySearchJobServiceTest.java diff --git a/enterprise/src/test/java/org/graylog/plugins/enterprise/search/db/SearchesCleanUpJobTest.java b/graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/db/SearchesCleanUpJobTest.java similarity index 100% rename from enterprise/src/test/java/org/graylog/plugins/enterprise/search/db/SearchesCleanUpJobTest.java rename to graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/db/SearchesCleanUpJobTest.java diff --git a/enterprise/src/test/java/org/graylog/plugins/enterprise/search/db/SearchesCleanUpJobWithDBServicesTest.java b/graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/db/SearchesCleanUpJobWithDBServicesTest.java similarity index 100% rename from enterprise/src/test/java/org/graylog/plugins/enterprise/search/db/SearchesCleanUpJobWithDBServicesTest.java rename to graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/db/SearchesCleanUpJobWithDBServicesTest.java diff --git a/enterprise/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/ElasticsearchBackendGeneratedRequestTestBase.java b/graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/ElasticsearchBackendGeneratedRequestTestBase.java similarity index 100% rename from enterprise/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/ElasticsearchBackendGeneratedRequestTestBase.java rename to graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/ElasticsearchBackendGeneratedRequestTestBase.java diff --git a/enterprise/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/ElasticsearchBackendMultiSearchTest.java b/graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/ElasticsearchBackendMultiSearchTest.java similarity index 100% rename from enterprise/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/ElasticsearchBackendMultiSearchTest.java rename to graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/ElasticsearchBackendMultiSearchTest.java diff --git a/enterprise/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/ElasticsearchBackendTest.java b/graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/ElasticsearchBackendTest.java similarity index 100% rename from enterprise/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/ElasticsearchBackendTest.java rename to graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/ElasticsearchBackendTest.java diff --git a/enterprise/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/ElasticsearchBackendTestBase.java b/graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/ElasticsearchBackendTestBase.java similarity index 100% rename from enterprise/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/ElasticsearchBackendTestBase.java rename to graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/ElasticsearchBackendTestBase.java diff --git a/enterprise/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/ElasticsearchBackendUsingCorrectIndicesTest.java b/graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/ElasticsearchBackendUsingCorrectIndicesTest.java similarity index 100% rename from enterprise/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/ElasticsearchBackendUsingCorrectIndicesTest.java rename to graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/ElasticsearchBackendUsingCorrectIndicesTest.java diff --git a/enterprise/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/IndexRangeContainsOneOfStreamsTest.java b/graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/IndexRangeContainsOneOfStreamsTest.java similarity index 100% rename from enterprise/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/IndexRangeContainsOneOfStreamsTest.java rename to graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/IndexRangeContainsOneOfStreamsTest.java diff --git a/enterprise/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/ESMessageListTest.java b/graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/ESMessageListTest.java similarity index 100% rename from enterprise/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/ESMessageListTest.java rename to graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/ESMessageListTest.java diff --git a/enterprise/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/ESPivotTest.java b/graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/ESPivotTest.java similarity index 100% rename from enterprise/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/ESPivotTest.java rename to graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/elasticsearch/searchtypes/pivot/ESPivotTest.java diff --git a/enterprise/src/test/java/org/graylog/plugins/enterprise/search/engine/QueryPlanTest.java b/graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/engine/QueryPlanTest.java similarity index 100% rename from enterprise/src/test/java/org/graylog/plugins/enterprise/search/engine/QueryPlanTest.java rename to graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/engine/QueryPlanTest.java diff --git a/enterprise/src/test/java/org/graylog/plugins/enterprise/search/rest/QualifyingViewsResourceTest.java b/graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/rest/QualifyingViewsResourceTest.java similarity index 100% rename from enterprise/src/test/java/org/graylog/plugins/enterprise/search/rest/QualifyingViewsResourceTest.java rename to graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/rest/QualifyingViewsResourceTest.java diff --git a/enterprise/src/test/java/org/graylog/plugins/enterprise/search/rest/SearchResourcePermissionsTest.java b/graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/rest/SearchResourcePermissionsTest.java similarity index 100% rename from enterprise/src/test/java/org/graylog/plugins/enterprise/search/rest/SearchResourcePermissionsTest.java rename to graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/rest/SearchResourcePermissionsTest.java diff --git a/enterprise/src/test/java/org/graylog/plugins/enterprise/search/rest/SearchResourceStreamPermissionsTest.java b/graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/rest/SearchResourceStreamPermissionsTest.java similarity index 100% rename from enterprise/src/test/java/org/graylog/plugins/enterprise/search/rest/SearchResourceStreamPermissionsTest.java rename to graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/rest/SearchResourceStreamPermissionsTest.java diff --git a/enterprise/src/test/java/org/graylog/plugins/enterprise/search/rest/SearchResourceTest.java b/graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/rest/SearchResourceTest.java similarity index 100% rename from enterprise/src/test/java/org/graylog/plugins/enterprise/search/rest/SearchResourceTest.java rename to graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/rest/SearchResourceTest.java diff --git a/enterprise/src/test/java/org/graylog/plugins/enterprise/search/rest/ViewSharingResourceTest.java b/graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/rest/ViewSharingResourceTest.java similarity index 100% rename from enterprise/src/test/java/org/graylog/plugins/enterprise/search/rest/ViewSharingResourceTest.java rename to graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/rest/ViewSharingResourceTest.java diff --git a/enterprise/src/test/java/org/graylog/plugins/enterprise/search/rest/ViewsResourceTest.java b/graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/rest/ViewsResourceTest.java similarity index 100% rename from enterprise/src/test/java/org/graylog/plugins/enterprise/search/rest/ViewsResourceTest.java rename to graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/rest/ViewsResourceTest.java diff --git a/enterprise/src/test/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/buckets/AutoIntervalBoundariesTest.java b/graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/buckets/AutoIntervalBoundariesTest.java similarity index 100% rename from enterprise/src/test/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/buckets/AutoIntervalBoundariesTest.java rename to graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/buckets/AutoIntervalBoundariesTest.java diff --git a/enterprise/src/test/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/buckets/AutoIntervalTest.java b/graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/buckets/AutoIntervalTest.java similarity index 100% rename from enterprise/src/test/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/buckets/AutoIntervalTest.java rename to graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/searchtypes/pivot/buckets/AutoIntervalTest.java diff --git a/enterprise/src/test/java/org/graylog/plugins/enterprise/search/views/QualifyingViewsServiceTest.java b/graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/views/QualifyingViewsServiceTest.java similarity index 100% rename from enterprise/src/test/java/org/graylog/plugins/enterprise/search/views/QualifyingViewsServiceTest.java rename to graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/views/QualifyingViewsServiceTest.java diff --git a/enterprise/src/test/java/org/graylog/plugins/enterprise/search/views/RequiresParameterSupportTest.java b/graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/views/RequiresParameterSupportTest.java similarity index 100% rename from enterprise/src/test/java/org/graylog/plugins/enterprise/search/views/RequiresParameterSupportTest.java rename to graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/views/RequiresParameterSupportTest.java diff --git a/enterprise/src/test/java/org/graylog/plugins/enterprise/search/views/ViewRequirementsTest.java b/graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/views/ViewRequirementsTest.java similarity index 100% rename from enterprise/src/test/java/org/graylog/plugins/enterprise/search/views/ViewRequirementsTest.java rename to graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/views/ViewRequirementsTest.java diff --git a/enterprise/src/test/java/org/graylog/plugins/enterprise/search/views/ViewServiceTest.java b/graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/views/ViewServiceTest.java similarity index 100% rename from enterprise/src/test/java/org/graylog/plugins/enterprise/search/views/ViewServiceTest.java rename to graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/views/ViewServiceTest.java diff --git a/enterprise/src/test/java/org/graylog/plugins/enterprise/search/views/ViewServiceUsesViewRequirementsTest.java b/graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/views/ViewServiceUsesViewRequirementsTest.java similarity index 100% rename from enterprise/src/test/java/org/graylog/plugins/enterprise/search/views/ViewServiceUsesViewRequirementsTest.java rename to graylog2-server/src/test/java/org/graylog/plugins/enterprise/search/views/ViewServiceUsesViewRequirementsTest.java