Further refactoring.

modules/server/src/main/scala/es/weso/rdfshape/server/Server.scala

@@ -4,14 +4,14 @@ import cats.effect._
 import cats.implicits._
 import com.typesafe.scalalogging.LazyLogging
 import es.weso.rdfshape.server.Server._
-import es.weso.rdfshape.server.api.routes.api.APIService
-import es.weso.rdfshape.server.api.routes.data.DataService
-import es.weso.rdfshape.server.api.routes.endpoint.EndpointService
-import es.weso.rdfshape.server.api.routes.fetch.FetchService
-import es.weso.rdfshape.server.api.routes.permalink.PermalinkService
+import es.weso.rdfshape.server.api.routes.api.service.APIService
+import es.weso.rdfshape.server.api.routes.data.service.DataService
+import es.weso.rdfshape.server.api.routes.endpoint.service.EndpointService
+import es.weso.rdfshape.server.api.routes.fetch.service.FetchService
+import es.weso.rdfshape.server.api.routes.permalink.service.PermalinkService
 import es.weso.rdfshape.server.api.routes.schema.service.SchemaService
-import es.weso.rdfshape.server.api.routes.shapemap.ShapeMapService
-import es.weso.rdfshape.server.api.routes.shex.ShExService
+import es.weso.rdfshape.server.api.routes.shapemap.service.ShapeMapService
+import es.weso.rdfshape.server.api.routes.shex.service.ShExService
 import es.weso.rdfshape.server.api.routes.wikibase.WikidataService
 import es.weso.rdfshape.server.utils.error.exceptions.SSLContextCreationException
 import es.weso.rdfshape.server.utils.error.{ExitCodes, SysUtils}

modules/server/src/main/scala/es/weso/rdfshape/server/api/routes/ApiDefinitions.scala → modules/server/src/main/scala/es/weso/rdfshape/server/api/definitions/ApiDefaults.scala

@@ -1,23 +1,13 @@
-package es.weso.rdfshape.server.api.routes
+package es.weso.rdfshape.server.api.definitions
 
 import es.weso.rdf.nodes.IRI
 import es.weso.rdfshape.server.api.format.{DataFormat, SchemaFormat}
 import es.weso.schema.{Schemas, ShapeMapTrigger}
 import es.weso.shapemaps.ShapeMap
 
-/** Global definitions used in the API
-  */
-object ApiDefinitions {
-
-  /** API route inside the web server
-    */
-  val api = "api"
-}
-
 /** Application-wide defaults
   */
-object Defaults {
-
+case object ApiDefaults {
   val availableDataFormats: List[DataFormat]     = DataFormat.availableFormats
   val defaultDataFormat: DataFormat              = DataFormat.defaultFormat
   val availableSchemaFormats: List[SchemaFormat] = SchemaFormat.availableFormats

modules/server/src/main/scala/es/weso/rdfshape/server/api/definitions/ApiDefinitions.scala

@@ -0,0 +1,10 @@
+package es.weso.rdfshape.server.api.definitions
+
+/** Global definitions used in the API
+  */
+case object ApiDefinitions {
+
+  /** API route inside the web server
+    */
+  val api = "api"
+}

modules/server/src/main/scala/es/weso/rdfshape/server/api/definitions/UmlDefinitions.scala

@@ -0,0 +1,14 @@
+package es.weso.rdfshape.server.api.definitions
+
+import es.weso.uml.PlantUMLOptions
+
+/** UML-generation related data
+  */
+case object UmlDefinitions {
+
+  /** Additional options passed down to PlantUML when generating diagrams on the fly.
+    */
+  val umlOptions: PlantUMLOptions = PlantUMLOptions(
+    watermark = Some("Generated by [[https://rdfshape.weso.es rdfshape]]")
+  )
+}

modules/server/src/main/scala/es/weso/rdfshape/server/api/merged/DataElement.scala

@@ -4,8 +4,8 @@ import cats.effect._
 import cats.implicits._
 import com.typesafe.scalalogging.LazyLogging
 import es.weso.rdf.jena.RDFAsJenaModel
+import es.weso.rdfshape.server.api.definitions.ApiDefaults
 import es.weso.rdfshape.server.api.format.DataFormat
-import es.weso.rdfshape.server.api.routes.Defaults
 import io.circe._
 
 /** Represent each chunk of RDF data submitted (mainly on RDF-merging operations)
@@ -71,7 +71,7 @@ object DataElement extends LazyLogging {
     dataUrl = None,
     endpoint = None,
     dataFile = None,
-    Defaults.defaultDataFormat,
+    ApiDefaults.defaultDataFormat,
     ActiveDataTab.default
   )
 
@@ -170,7 +170,7 @@ object DataElement extends LazyLogging {
           dataFormatStr <- cursor
             .downField("dataFormat")
             .as[String]
-            .orElse(Right(Defaults.defaultDataFormat.name))
+            .orElse(Right(ApiDefaults.defaultDataFormat.name))
           dataFormat <- DataFormat
             .fromString(dataFormatStr)
             .leftMap(s =>