The refactoring will continue until morale improves.

LICENSE.md

@@ -13,4 +13,3 @@
 
     You should have received a copy of the GNU Affero General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-

code/api/index-api/build.gradle

@@ -17,7 +17,7 @@ dependencies {
     implementation project(':code:common:service-discovery')
     implementation project(':code:common:service-client')
 
-    implementation project(':code:index:index-query')
+    implementation project(':code:features-index:index-query')
 
     implementation libs.lombok
     annotationProcessor libs.lombok

code/crawl-models/common/build.gradle

@@ -15,7 +15,7 @@ dependencies {
     implementation project(':code:common:model')
     implementation project(':code:common:config')
     implementation project(':code:libraries:guarded-regex')
-    implementation project(':code:crawl:crawling-model')
+    implementation project(':code:crawl-models:crawling-model')
 
     implementation libs.notnull
     implementation libs.lombok

code/crawl-models/converting-model/build.gradle

@@ -17,7 +17,7 @@ dependencies {
     implementation project(':code:common:service-client')
     implementation project(':code:libraries:language-processing')
 
-    implementation project(':code:crawl:common')
+    implementation project(':code:crawl-models:common')
 
     implementation libs.lombok
     annotationProcessor libs.lombok

code/crawl-models/converting-model/readme.md

@@ -0,0 +1,4 @@
+# Converting Models
+
+Contains models shared by the [converting-process](../../crawl/converting-process/) and
+[loading-process](../../crawl/loading-process/).

code/crawl-models/crawling-model/readme.md

@@ -1,7 +1,7 @@
 # Crawling Models
 
-Contains models shared by the [crawling-process](../crawling-process/) and
+Contains models shared by the [crawling-process](../../crawl/crawling-process/) and
-[converting-process](../converting-process/).
+[converting-process](../../crawl/converting-process/).
 
 ## Central Classes
 

code/crawl/converting-model/readme.md

@@ -1,4 +0,0 @@
-# Converting Models
-
-Contains models shared by the [converting-process](../converting-process/) and
-[loading-process](../loading-process/).

code/crawl/converting-process/build.gradle

@@ -33,13 +33,13 @@ dependencies {
     implementation project(':code:libraries:big-string')
     implementation project(':code:libraries:language-processing')
 
-    implementation project(':code:crawl:common')
+    implementation project(':code:crawl-models:common')
-    implementation project(':code:crawl:converting-model')
+    implementation project(':code:crawl-models:converting-model')
-    implementation project(':code:crawl:crawling-model')
+    implementation project(':code:crawl-models:crawling-model')
 
-    implementation project(':code:features:adblock')
+    implementation project(':code:features-crawl:adblock')
-    implementation project(':code:features:pubdate')
+    implementation project(':code:features-crawl:pubdate')
-    implementation project(':code:features:topic-detection')
+    implementation project(':code:features-crawl:topic-detection')
 
     implementation libs.lombok
     annotationProcessor libs.lombok

code/crawl/crawl-job-extractor-process/build.gradle

@@ -21,8 +21,8 @@ tasks.distZip.enabled = false
 dependencies {
     implementation project(':code:common:model')
     implementation project(':code:common:service')
-    implementation project(':code:crawl:crawling-model')
+    implementation project(':code:crawl-models:crawling-model')
-    implementation project(':code:crawl:common')
+    implementation project(':code:crawl-models:common')
 
     implementation libs.lombok
     annotationProcessor libs.lombok

code/crawl/crawling-process/build.gradle

@@ -27,9 +27,9 @@ dependencies {
     implementation project(':code:common:service-discovery')
     implementation project(':code:common:service-client')
     implementation project(':code:libraries:language-processing')
-    implementation project(':code:crawl:common')
+    implementation project(':code:crawl-models:common')
-    implementation project(':code:crawl:crawling-model')
+    implementation project(':code:crawl-models:crawling-model')
-    implementation project(':code:crawl:converting-model')
+    implementation project(':code:crawl-models:converting-model')
 
     implementation libs.lombok
     annotationProcessor libs.lombok

code/crawl/experimental/build.gradle

@@ -20,11 +20,13 @@ dependencies {
     implementation project(':code:common:service-discovery')
     implementation project(':code:common:service-client')
     implementation project(':code:libraries:language-processing')
-    implementation project(':code:crawl:common')
+
-    implementation project(':code:crawl:crawling-model')
+    implementation project(':code:crawl-models:common')
+    implementation project(':code:crawl-models:crawling-model')
+
     implementation project(':code:crawl:converting-process')
-    implementation project(':code:features:adblock')
+    implementation project(':code:features-crawl:adblock')
-    implementation project(':code:features:topic-detection')
+    implementation project(':code:features-crawl:topic-detection')
 
     implementation libs.lombok
     annotationProcessor libs.lombok

code/crawl/loading-process/build.gradle

@@ -24,15 +24,15 @@ dependencies {
     implementation project(':code:common:service')
     implementation project(':code:common:service-discovery')
     implementation project(':code:common:service-client')
-    implementation project(':code:index:lexicon')
+    implementation project(':code:features-index:lexicon')
-    implementation project(':code:index:index-journal')
+    implementation project(':code:features-index:index-journal')
     implementation project(':code:libraries:language-processing')
 
     testImplementation project(':code:services-core:search-service')
 
-    implementation project(':code:crawl:common')
+    implementation project(':code:crawl-models:common')
-    implementation project(':code:crawl:crawling-model')
+    implementation project(':code:crawl-models:crawling-model')
-    implementation project(':code:crawl:converting-model')
+    implementation project(':code:crawl-models:converting-model')
 
 
     implementation libs.lombok

code/crawl/readme.md

@@ -8,13 +8,13 @@ based on the content in the database.
 ## 2. Crawl Process
 
 The [crawling-process](crawling-process/) fetches website contents and saves them
-as compressed JSON models described in [crawling-model](crawling-model/).
+as compressed JSON models described in [crawling-model](../crawl-models/crawling-model/).
 
 ## 3. Converting Process
 
 The [converting-process](converting-process/) reads crawl data from the crawling step and 
 processes them, extracting keywords and metadata and saves them as compressed JSON models 
-described in [converting-model](converting-model/).
+described in [converting-model](../crawl-models/converting-model/).
 
 ## 4. Loading Process
 

code/features-crawl/pubdate/build.gradle

@@ -15,7 +15,7 @@ java {
 
 dependencies {
     implementation project(':code:common:model')
-    implementation project(':code:crawl:common')
+    implementation project(':code:crawl-models:common')
 
     implementation libs.lombok
     annotationProcessor libs.lombok

code/features-crawl/readme.md

@@ -0,0 +1,10 @@
+# Crawl Features
+
+These are bits of search-engine related code that are relatively isolated pieces of business logic,
+that benefit from the clarity of being kept separate from the rest of the crawling code.
+
+
+* [adblock](adblock/) - Simulates Adblock
+* [pubdate](pubdate/) - Determines when a document was published
+* [topic-detection](topic-detection/) - Tries to identify the topic of a website
+