diff --git a/RELEASENOTES.adoc b/RELEASENOTES.adoc
index 7b2eabc2..2ebff4ec 100644
--- a/RELEASENOTES.adoc
+++ b/RELEASENOTES.adoc
@@ -163,7 +163,7 @@
 * PR #294: Examples always start with a newline if there is other content in the same cell
 * PR 307: Include required parameters in example request
 
-=== Version 1.4.0
+=== Version 2.0.0
 * Added openapi2markup to support OpenAPI v3
 * Issue #409: Fixed JSON response example
 
diff --git a/build.gradle b/build.gradle
index b8c255d5..f2340c92 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,13 +22,13 @@ allprojects {
     group 'io.github.swagger2markup'
     description = 'swagger2markup Build'
 
-    repositories {
+    repositories {        
+        jcenter()
+        mavenCentral()
         maven {
             name "OSS Snapshots"
             url "https://oss.jfrog.org/artifactory/oss-snapshot-local"
         }
-        jcenter()
-        mavenCentral()
     }
 }
 artifactoryPublish.skip = true // apply to all projects except the root
diff --git a/openapi2markup/src/main/java/io/github/swagger2markup/OpenAPI2MarkupConverter.java b/openapi2markup/src/main/java/io/github/swagger2markup/OpenAPI2MarkupConverter.java
index 37900ab7..866c683d 100644
--- a/openapi2markup/src/main/java/io/github/swagger2markup/OpenAPI2MarkupConverter.java
+++ b/openapi2markup/src/main/java/io/github/swagger2markup/OpenAPI2MarkupConverter.java
@@ -16,8 +16,6 @@
 package io.github.swagger2markup;
 
 import io.github.swagger2markup.adoc.ast.impl.DocumentImpl;
-import io.github.swagger2markup.config.Labels;
-import io.github.swagger2markup.config.MarkupLanguage;
 import io.github.swagger2markup.config.OpenAPILabels;
 import io.github.swagger2markup.config.builder.OpenAPI2MarkupConfigBuilder;
 import io.github.swagger2markup.extension.OpenAPI2MarkupExtensionRegistry;
diff --git a/openapi2markup/src/main/java/io/github/swagger2markup/config/OpenAPILabels.java b/openapi2markup/src/main/java/io/github/swagger2markup/config/OpenAPILabels.java
index 2dd26d27..b8a69197 100644
--- a/openapi2markup/src/main/java/io/github/swagger2markup/config/OpenAPILabels.java
+++ b/openapi2markup/src/main/java/io/github/swagger2markup/config/OpenAPILabels.java
@@ -1,7 +1,7 @@
 package io.github.swagger2markup.config;
 
+import io.github.swagger2markup.Labels;
 import io.github.swagger2markup.OpenSchema2MarkupConfig;
-import io.github.swagger2markup.config.builder.OpenAPI2MarkupConfigBuilder;
 
 import java.util.ResourceBundle;
 
diff --git a/openapi2markup/src/main/java/io/github/swagger2markup/extension/MarkupComponent.java b/openapi2markup/src/main/java/io/github/swagger2markup/extension/MarkupComponent.java
index 5302653f..45afe1f7 100644
--- a/openapi2markup/src/main/java/io/github/swagger2markup/extension/MarkupComponent.java
+++ b/openapi2markup/src/main/java/io/github/swagger2markup/extension/MarkupComponent.java
@@ -17,9 +17,8 @@
 package io.github.swagger2markup.extension;
 
 import io.github.swagger2markup.OpenSchema2MarkupConfig;
-import io.github.swagger2markup.config.builder.OpenAPI2MarkupConfigBuilder;
 import io.github.swagger2markup.OpenAPI2MarkupConverter;
-import io.github.swagger2markup.config.Labels;
+import io.github.swagger2markup.Labels;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.vavr.Function2;
 import org.slf4j.Logger;
diff --git a/swagger2markup-core/src/main/java/io/github/swagger2markup/AbstractSchema2MarkupConverter.java b/swagger2markup-core/src/main/java/io/github/swagger2markup/AbstractSchema2MarkupConverter.java
index 5e1edef0..5b8ba2e1 100644
--- a/swagger2markup-core/src/main/java/io/github/swagger2markup/AbstractSchema2MarkupConverter.java
+++ b/swagger2markup-core/src/main/java/io/github/swagger2markup/AbstractSchema2MarkupConverter.java
@@ -15,7 +15,6 @@
  */
 package io.github.swagger2markup;
 
-import io.github.swagger2markup.config.Labels;
 import io.github.swagger2markup.config.Schema2MarkupConfig;
 import io.github.swagger2markup.extension.Schema2MarkupExtensionRegistry;
 import org.apache.commons.lang3.Validate;
diff --git a/swagger2markup-core/src/main/java/io/github/swagger2markup/config/GroupBy.java b/swagger2markup-core/src/main/java/io/github/swagger2markup/GroupBy.java
similarity index 94%
rename from swagger2markup-core/src/main/java/io/github/swagger2markup/config/GroupBy.java
rename to swagger2markup-core/src/main/java/io/github/swagger2markup/GroupBy.java
index d86044db..4e835d1b 100644
--- a/swagger2markup-core/src/main/java/io/github/swagger2markup/config/GroupBy.java
+++ b/swagger2markup-core/src/main/java/io/github/swagger2markup/GroupBy.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.swagger2markup.config;
+package io.github.swagger2markup;
 
 /**
  * GroupBy enum for ordering
diff --git a/swagger2markup-core/src/main/java/io/github/swagger2markup/config/Labels.java b/swagger2markup-core/src/main/java/io/github/swagger2markup/Labels.java
similarity index 96%
rename from swagger2markup-core/src/main/java/io/github/swagger2markup/config/Labels.java
rename to swagger2markup-core/src/main/java/io/github/swagger2markup/Labels.java
index d96c56b8..5b068c60 100644
--- a/swagger2markup-core/src/main/java/io/github/swagger2markup/config/Labels.java
+++ b/swagger2markup-core/src/main/java/io/github/swagger2markup/Labels.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.swagger2markup.config;
+package io.github.swagger2markup;
 
 import java.util.ResourceBundle;
 
diff --git a/swagger2markup-core/src/main/java/io/github/swagger2markup/config/Language.java b/swagger2markup-core/src/main/java/io/github/swagger2markup/Language.java
similarity index 96%
rename from swagger2markup-core/src/main/java/io/github/swagger2markup/config/Language.java
rename to swagger2markup-core/src/main/java/io/github/swagger2markup/Language.java
index 353713a7..fbd5ca29 100644
--- a/swagger2markup-core/src/main/java/io/github/swagger2markup/config/Language.java
+++ b/swagger2markup-core/src/main/java/io/github/swagger2markup/Language.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.github.swagger2markup.config;
+package io.github.swagger2markup;
 
 import java.util.Locale;
 
diff --git a/swagger2markup-core/src/main/java/io/github/swagger2markup/config/MarkupLanguage.java b/swagger2markup-core/src/main/java/io/github/swagger2markup/MarkupLanguage.java
similarity index 96%
rename from swagger2markup-core/src/main/java/io/github/swagger2markup/config/MarkupLanguage.java
rename to swagger2markup-core/src/main/java/io/github/swagger2markup/MarkupLanguage.java
index 79168dce..31be2e36 100644
--- a/swagger2markup-core/src/main/java/io/github/swagger2markup/config/MarkupLanguage.java
+++ b/swagger2markup-core/src/main/java/io/github/swagger2markup/MarkupLanguage.java
@@ -17,7 +17,7 @@
  *
  */
 
-package io.github.swagger2markup.config;
+package io.github.swagger2markup;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/swagger2markup-core/src/main/java/io/github/swagger2markup/config/OrderBy.java b/swagger2markup-core/src/main/java/io/github/swagger2markup/OrderBy.java
similarity index 94%
rename from swagger2markup-core/src/main/java/io/github/swagger2markup/config/OrderBy.java
rename to swagger2markup-core/src/main/java/io/github/swagger2markup/OrderBy.java
index 4b7313a0..01ded642 100644
--- a/swagger2markup-core/src/main/java/io/github/swagger2markup/config/OrderBy.java
+++ b/swagger2markup-core/src/main/java/io/github/swagger2markup/OrderBy.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.swagger2markup.config;
+package io.github.swagger2markup;
 
 public enum OrderBy {
     AS_IS,
diff --git a/swagger2markup-core/src/main/java/io/github/swagger2markup/config/PageBreakLocations.java b/swagger2markup-core/src/main/java/io/github/swagger2markup/PageBreakLocations.java
similarity index 51%
rename from swagger2markup-core/src/main/java/io/github/swagger2markup/config/PageBreakLocations.java
rename to swagger2markup-core/src/main/java/io/github/swagger2markup/PageBreakLocations.java
index fca12490..077f28ba 100644
--- a/swagger2markup-core/src/main/java/io/github/swagger2markup/config/PageBreakLocations.java
+++ b/swagger2markup-core/src/main/java/io/github/swagger2markup/PageBreakLocations.java
@@ -13,11 +13,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.swagger2markup.config;
+package io.github.swagger2markup;
 
 /**
  * Marker interface for PageBreak enums
  */
-public interface PageBreakLocations {
-
+public enum PageBreakLocations {
+    BEFORE_OPERATION,
+    BEFORE_OPERATION_DESCRIPTION,
+    BEFORE_OPERATION_PARAMETERS,
+    BEFORE_OPERATION_RESPONSES,
+    BEFORE_OPERATION_CONSUMES,
+    BEFORE_OPERATION_PRODUCES,
+    BEFORE_OPERATION_EXAMPLE_REQUEST,
+    BEFORE_OPERATION_EXAMPLE_RESPONSE,
+    BEFORE_DEFINITION,
+    AFTER_OPERATION,
+    AFTER_OPERATION_DESCRIPTION,
+    AFTER_OPERATION_PARAMETERS,
+    AFTER_OPERATION_RESPONSES,
+    AFTER_OPERATION_CONSUMES,
+    AFTER_OPERATION_PRODUCES,
+    AFTER_OPERATION_EXAMPLE_REQUEST,
+    AFTER_OPERATION_EXAMPLE_RESPONSE,
+    AFTER_DEFINITION
 }
\ No newline at end of file
diff --git a/swagger2markup-core/src/main/java/io/github/swagger2markup/Schema2MarkupProperties.java b/swagger2markup-core/src/main/java/io/github/swagger2markup/Schema2MarkupProperties.java
index fea2332d..f4e26eb7 100644
--- a/swagger2markup-core/src/main/java/io/github/swagger2markup/Schema2MarkupProperties.java
+++ b/swagger2markup-core/src/main/java/io/github/swagger2markup/Schema2MarkupProperties.java
@@ -15,7 +15,6 @@
  */
 package io.github.swagger2markup;
 
-import io.github.swagger2markup.config.*;
 import io.github.swagger2markup.utils.URIUtils;
 import org.apache.commons.collections4.IteratorUtils;
 import org.apache.commons.configuration2.Configuration;
diff --git a/swagger2markup-core/src/main/java/io/github/swagger2markup/config/Schema2MarkupConfig.java b/swagger2markup-core/src/main/java/io/github/swagger2markup/config/Schema2MarkupConfig.java
index 65c1b9d1..881510ff 100644
--- a/swagger2markup-core/src/main/java/io/github/swagger2markup/config/Schema2MarkupConfig.java
+++ b/swagger2markup-core/src/main/java/io/github/swagger2markup/config/Schema2MarkupConfig.java
@@ -15,7 +15,7 @@
  */
 package io.github.swagger2markup.config;
 
-import io.github.swagger2markup.Schema2MarkupProperties;
+import io.github.swagger2markup.*;
 import io.github.swagger2markup.model.Parameter;
 import io.github.swagger2markup.model.PathOperation;
 
diff --git a/swagger2markup-core/src/main/java/io/github/swagger2markup/config/builder/Schema2MarkupConfigBuilder.java b/swagger2markup-core/src/main/java/io/github/swagger2markup/config/builder/Schema2MarkupConfigBuilder.java
index c67dcc9e..021c875b 100644
--- a/swagger2markup-core/src/main/java/io/github/swagger2markup/config/builder/Schema2MarkupConfigBuilder.java
+++ b/swagger2markup-core/src/main/java/io/github/swagger2markup/config/builder/Schema2MarkupConfigBuilder.java
@@ -17,7 +17,7 @@
 package io.github.swagger2markup.config.builder;
 
 import com.google.common.collect.Ordering;
-import io.github.swagger2markup.Schema2MarkupProperties;
+import io.github.swagger2markup.*;
 import io.github.swagger2markup.config.*;
 import io.github.swagger2markup.model.Parameter;
 import io.github.swagger2markup.model.PathOperation;
diff --git a/swagger2markup/src/main/java/io/github/swagger2markup/Swagger2MarkupConverter.java b/swagger2markup/src/main/java/io/github/swagger2markup/Swagger2MarkupConverter.java
index 038deab1..25b040e5 100644
--- a/swagger2markup/src/main/java/io/github/swagger2markup/Swagger2MarkupConverter.java
+++ b/swagger2markup/src/main/java/io/github/swagger2markup/Swagger2MarkupConverter.java
@@ -17,7 +17,6 @@ package io.github.swagger2markup;
 
 import io.github.swagger2markup.builder.Swagger2MarkupConfigBuilder;
 import io.github.swagger2markup.builder.Swagger2MarkupExtensionRegistryBuilder;
-import io.github.swagger2markup.config.Labels;
 import io.github.swagger2markup.internal.document.DefinitionsDocument;
 import io.github.swagger2markup.internal.document.OverviewDocument;
 import io.github.swagger2markup.internal.document.PathsDocument;
diff --git a/swagger2markup/src/main/java/io/github/swagger2markup/SwaggerLabels.java b/swagger2markup/src/main/java/io/github/swagger2markup/SwaggerLabels.java
index 096fc73f..a97692fe 100644
--- a/swagger2markup/src/main/java/io/github/swagger2markup/SwaggerLabels.java
+++ b/swagger2markup/src/main/java/io/github/swagger2markup/SwaggerLabels.java
@@ -16,8 +16,6 @@
 package io.github.swagger2markup;
 
 
-import io.github.swagger2markup.config.Labels;
-
 import java.util.ResourceBundle;
 
 public class SwaggerLabels extends Labels {
diff --git a/swagger2markup/src/main/java/io/github/swagger2markup/SwaggerPageBreakLocations.java b/swagger2markup/src/main/java/io/github/swagger2markup/SwaggerPageBreakLocations.java
index 9def6f78..9d973e27 100644
--- a/swagger2markup/src/main/java/io/github/swagger2markup/SwaggerPageBreakLocations.java
+++ b/swagger2markup/src/main/java/io/github/swagger2markup/SwaggerPageBreakLocations.java
@@ -15,7 +15,7 @@
  */
 package io.github.swagger2markup;
 
-public enum SwaggerPageBreakLocations implements io.github.swagger2markup.config.PageBreakLocations {
+public enum SwaggerPageBreakLocations implements PageBreakLocations {
     BEFORE_OPERATION,
     BEFORE_OPERATION_DESCRIPTION,
     BEFORE_OPERATION_PARAMETERS,
diff --git a/swagger2markup/src/main/java/io/github/swagger2markup/internal/adapter/ParameterAdapter.java b/swagger2markup/src/main/java/io/github/swagger2markup/internal/adapter/ParameterAdapter.java
index f180f9e7..8f16a4d4 100644
--- a/swagger2markup/src/main/java/io/github/swagger2markup/internal/adapter/ParameterAdapter.java
+++ b/swagger2markup/src/main/java/io/github/swagger2markup/internal/adapter/ParameterAdapter.java
@@ -109,7 +109,7 @@ public class ParameterAdapter {
     }
 
     public String displayDescription(MarkupDocBuilder markupDocBuilder) {
-        io.github.swagger2markup.config.MarkupLanguage schemaMarkupLanguage = config.getSchemaMarkupLanguage();
+        io.github.swagger2markup.MarkupLanguage schemaMarkupLanguage = config.getSchemaMarkupLanguage();
         return markupDescription(MarkupLanguage.valueOf(schemaMarkupLanguage.name()), markupDocBuilder, getDescription());
     }
 
diff --git a/swagger2markup/src/main/java/io/github/swagger2markup/internal/component/BodyParameterComponent.java b/swagger2markup/src/main/java/io/github/swagger2markup/internal/component/BodyParameterComponent.java
index a52b798b..2cd1df54 100644
--- a/swagger2markup/src/main/java/io/github/swagger2markup/internal/component/BodyParameterComponent.java
+++ b/swagger2markup/src/main/java/io/github/swagger2markup/internal/component/BodyParameterComponent.java
@@ -17,7 +17,7 @@ package io.github.swagger2markup.internal.component;
 
 
 import io.github.swagger2markup.Swagger2MarkupConverter;
-import io.github.swagger2markup.config.GroupBy;
+import io.github.swagger2markup.GroupBy;
 import io.github.swagger2markup.internal.adapter.ParameterAdapter;
 import io.github.swagger2markup.internal.resolver.DocumentResolver;
 import io.github.swagger2markup.internal.type.ObjectType;
diff --git a/swagger2markup/src/main/java/io/github/swagger2markup/internal/component/PathOperationComponent.java b/swagger2markup/src/main/java/io/github/swagger2markup/internal/component/PathOperationComponent.java
index 672b4396..e2026088 100644
--- a/swagger2markup/src/main/java/io/github/swagger2markup/internal/component/PathOperationComponent.java
+++ b/swagger2markup/src/main/java/io/github/swagger2markup/internal/component/PathOperationComponent.java
@@ -20,8 +20,8 @@ import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.github.swagger2markup.Swagger2MarkupConverter;
-import io.github.swagger2markup.config.GroupBy;
-import io.github.swagger2markup.config.PageBreakLocations;
+import io.github.swagger2markup.GroupBy;
+import io.github.swagger2markup.PageBreakLocations;
 import io.github.swagger2markup.internal.resolver.DocumentResolver;
 import io.github.swagger2markup.internal.type.ObjectType;
 import io.github.swagger2markup.internal.utils.ExamplesUtil;
diff --git a/swagger2markup/src/main/java/io/github/swagger2markup/internal/document/PathsDocument.java b/swagger2markup/src/main/java/io/github/swagger2markup/internal/document/PathsDocument.java
index ac8972c2..f825a8d3 100644
--- a/swagger2markup/src/main/java/io/github/swagger2markup/internal/document/PathsDocument.java
+++ b/swagger2markup/src/main/java/io/github/swagger2markup/internal/document/PathsDocument.java
@@ -19,7 +19,7 @@ import com.google.common.collect.Multimap;
 import io.github.swagger2markup.Swagger2MarkupConfig;
 import io.github.swagger2markup.Swagger2MarkupConverter.SwaggerContext;
 import io.github.swagger2markup.SwaggerLabels;
-import io.github.swagger2markup.config.GroupBy;
+import io.github.swagger2markup.GroupBy;
 import io.github.swagger2markup.internal.component.PathOperationComponent;
 import io.github.swagger2markup.internal.resolver.DefinitionDocumentResolverFromOperation;
 import io.github.swagger2markup.internal.resolver.OperationDocumentNameResolver;
diff --git a/swagger2markup/src/main/java/io/github/swagger2markup/spi/MarkupComponent.java b/swagger2markup/src/main/java/io/github/swagger2markup/spi/MarkupComponent.java
index 6ed044e0..361e3055 100644
--- a/swagger2markup/src/main/java/io/github/swagger2markup/spi/MarkupComponent.java
+++ b/swagger2markup/src/main/java/io/github/swagger2markup/spi/MarkupComponent.java
@@ -18,7 +18,7 @@ package io.github.swagger2markup.spi;
 
 import io.github.swagger2markup.Swagger2MarkupConfig;
 import io.github.swagger2markup.Swagger2MarkupConverter;
-import io.github.swagger2markup.config.Labels;
+import io.github.swagger2markup.Labels;
 import io.github.swagger2markup.markup.builder.MarkupDocBuilder;
 import io.vavr.Function2;
 import org.slf4j.Logger;
diff --git a/swagger2markup/src/main/java/io/github/swagger2markup/spi/PathsDocumentExtension.java b/swagger2markup/src/main/java/io/github/swagger2markup/spi/PathsDocumentExtension.java
index 8633b40b..9b23bb65 100644
--- a/swagger2markup/src/main/java/io/github/swagger2markup/spi/PathsDocumentExtension.java
+++ b/swagger2markup/src/main/java/io/github/swagger2markup/spi/PathsDocumentExtension.java
@@ -17,7 +17,7 @@
 package io.github.swagger2markup.spi;
 
 import com.google.common.base.Optional;
-import io.github.swagger2markup.config.GroupBy;
+import io.github.swagger2markup.GroupBy;
 import io.github.swagger2markup.markup.builder.MarkupDocBuilder;
 import io.github.swagger2markup.model.PathOperation;
 import org.apache.commons.lang3.Validate;
diff --git a/swagger2markup/src/test/java/io/github/swagger2markup/AsciidocConverterTest.java b/swagger2markup/src/test/java/io/github/swagger2markup/AsciidocConverterTest.java
index 2a68726f..ad31ba34 100644
--- a/swagger2markup/src/test/java/io/github/swagger2markup/AsciidocConverterTest.java
+++ b/swagger2markup/src/test/java/io/github/swagger2markup/AsciidocConverterTest.java
@@ -17,10 +17,6 @@ package io.github.swagger2markup;
 
 import io.github.swagger2markup.assertions.DiffUtils;
 import io.github.swagger2markup.builder.Swagger2MarkupConfigBuilder;
-import io.github.swagger2markup.config.GroupBy;
-import io.github.swagger2markup.config.Language;
-import io.github.swagger2markup.config.MarkupLanguage;
-import io.github.swagger2markup.config.OrderBy;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.junit.Before;
@@ -124,6 +120,7 @@ public class AsciidocConverterTest {
 
         //When
         Swagger2MarkupConfig config =  new Swagger2MarkupConfigBuilder()
+                .withOutputLanguage(Language.BR)
                 .withTagOrdering(OrderBy.AS_IS)
                 .withParameterOrdering(OrderBy.AS_IS)
                 .withOperationOrdering(OrderBy.AS_IS)
@@ -610,7 +607,7 @@ public class AsciidocConverterTest {
 
         //When
         Swagger2MarkupConfig config =  new Swagger2MarkupConfigBuilder()
-                .withSwaggerMarkupLanguage(io.github.swagger2markup.config.MarkupLanguage.ASCIIDOC)
+                .withSwaggerMarkupLanguage(MarkupLanguage.ASCIIDOC)
                 .build();
 
         Swagger2MarkupConverter.from(file).withConfig(config).build()
diff --git a/swagger2markup/src/test/java/io/github/swagger2markup/DocumentationTest.java b/swagger2markup/src/test/java/io/github/swagger2markup/DocumentationTest.java
index b7d609fe..081d9c14 100644
--- a/swagger2markup/src/test/java/io/github/swagger2markup/DocumentationTest.java
+++ b/swagger2markup/src/test/java/io/github/swagger2markup/DocumentationTest.java
@@ -18,8 +18,6 @@ package io.github.swagger2markup;
 import io.github.swagger2markup.builder.MyExtension;
 import io.github.swagger2markup.builder.Swagger2MarkupConfigBuilder;
 import io.github.swagger2markup.builder.Swagger2MarkupExtensionRegistryBuilder;
-import io.github.swagger2markup.config.GroupBy;
-import io.github.swagger2markup.config.Language;
 import io.github.swagger2markup.markup.builder.MarkupLanguage;
 import io.github.swagger2markup.spi.Swagger2MarkupExtensionRegistry;
 import org.apache.commons.configuration2.Configuration;
@@ -88,7 +86,7 @@ public class DocumentationTest {
 
         // tag::swagger2MarkupConfigBuilder[]
         Swagger2MarkupConfig config = (Swagger2MarkupConfig) new Swagger2MarkupConfigBuilder() //<1>
-                .withMarkupLanguage(io.github.swagger2markup.config.MarkupLanguage.MARKDOWN) //<2>
+                .withMarkupLanguage(io.github.swagger2markup.MarkupLanguage.MARKDOWN) //<2>
                 .withOutputLanguage(Language.DE) //<3>
                 .withPathsGroupedBy(GroupBy.TAGS) //<4>
                 .build(); //<5>
diff --git a/swagger2markup/src/test/java/io/github/swagger2markup/MarkdownConverterTest.java b/swagger2markup/src/test/java/io/github/swagger2markup/MarkdownConverterTest.java
index 45eccc56..d02abb74 100644
--- a/swagger2markup/src/test/java/io/github/swagger2markup/MarkdownConverterTest.java
+++ b/swagger2markup/src/test/java/io/github/swagger2markup/MarkdownConverterTest.java
@@ -21,7 +21,6 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import io.github.swagger2markup.assertions.DiffUtils;
 import io.github.swagger2markup.builder.Swagger2MarkupConfigBuilder;
-import io.github.swagger2markup.config.MarkupLanguage;
 import org.apache.commons.io.FileUtils;
 import org.junit.Before;
 import org.junit.Test;
@@ -128,7 +127,7 @@ public class MarkdownConverterTest {
 
         //When
         Swagger2MarkupConfig config = new Swagger2MarkupConfigBuilder()
-                .withMarkupLanguage(io.github.swagger2markup.config.MarkupLanguage.MARKDOWN)
+                .withMarkupLanguage(MarkupLanguage.MARKDOWN)
                 .build();
         Swagger2MarkupConverter.from(file)
                 .withConfig(config)
@@ -152,7 +151,7 @@ public class MarkdownConverterTest {
 
         //When
         Swagger2MarkupConfig config = new Swagger2MarkupConfigBuilder()
-                .withMarkupLanguage(io.github.swagger2markup.config.MarkupLanguage.MARKDOWN)
+                .withMarkupLanguage(MarkupLanguage.MARKDOWN)
                 .build();
         Swagger2MarkupConverter.from(file)
                 .withConfig(config)
diff --git a/swagger2markup/src/test/java/io/github/swagger2markup/builder/Swagger2MarkupConfigBuilderTest.java b/swagger2markup/src/test/java/io/github/swagger2markup/builder/Swagger2MarkupConfigBuilderTest.java
index 090978fa..049298ef 100644
--- a/swagger2markup/src/test/java/io/github/swagger2markup/builder/Swagger2MarkupConfigBuilderTest.java
+++ b/swagger2markup/src/test/java/io/github/swagger2markup/builder/Swagger2MarkupConfigBuilderTest.java
@@ -18,9 +18,9 @@ package io.github.swagger2markup.builder;
 import com.google.common.collect.Ordering;
 import io.github.swagger2markup.Swagger2MarkupConfig;
 import io.github.swagger2markup.Swagger2MarkupProperties;
-import io.github.swagger2markup.config.GroupBy;
-import io.github.swagger2markup.config.Language;
-import io.github.swagger2markup.config.OrderBy;
+import io.github.swagger2markup.GroupBy;
+import io.github.swagger2markup.Language;
+import io.github.swagger2markup.OrderBy;
 import io.github.swagger2markup.markup.builder.MarkupLanguage;
 import org.junit.Test;
 
diff --git a/swagger2markup/src/test/java/io/github/swagger2markup/internal/resolver/DefinitionDocumentNameResolverTest.java b/swagger2markup/src/test/java/io/github/swagger2markup/internal/resolver/DefinitionDocumentNameResolverTest.java
index 740b8ea4..5d862088 100644
--- a/swagger2markup/src/test/java/io/github/swagger2markup/internal/resolver/DefinitionDocumentNameResolverTest.java
+++ b/swagger2markup/src/test/java/io/github/swagger2markup/internal/resolver/DefinitionDocumentNameResolverTest.java
@@ -18,7 +18,7 @@ package io.github.swagger2markup.internal.resolver;
 import io.github.swagger2markup.Swagger2MarkupConfig;
 import io.github.swagger2markup.Swagger2MarkupConverter;
 import io.github.swagger2markup.builder.Swagger2MarkupConfigBuilder;
-import io.github.swagger2markup.config.MarkupLanguage;
+import io.github.swagger2markup.MarkupLanguage;
 import org.junit.Test;
 
 import java.nio.file.Paths;
diff --git a/swagger2markup/src/test/java/io/github/swagger2markup/internal/resolver/DefinitionDocumentResolverDefaultTest.java b/swagger2markup/src/test/java/io/github/swagger2markup/internal/resolver/DefinitionDocumentResolverDefaultTest.java
index 09d7d454..729077ca 100644
--- a/swagger2markup/src/test/java/io/github/swagger2markup/internal/resolver/DefinitionDocumentResolverDefaultTest.java
+++ b/swagger2markup/src/test/java/io/github/swagger2markup/internal/resolver/DefinitionDocumentResolverDefaultTest.java
@@ -18,7 +18,7 @@ package io.github.swagger2markup.internal.resolver;
 import io.github.swagger2markup.Swagger2MarkupConfig;
 import io.github.swagger2markup.Swagger2MarkupConverter;
 import io.github.swagger2markup.builder.Swagger2MarkupConfigBuilder;
-import io.github.swagger2markup.config.MarkupLanguage;
+import io.github.swagger2markup.MarkupLanguage;
 import org.junit.Test;
 
 import java.nio.file.FileSystems;
diff --git a/swagger2markup/src/test/java/io/github/swagger2markup/internal/resolver/DefinitionDocumentResolverFromDefinitionTest.java b/swagger2markup/src/test/java/io/github/swagger2markup/internal/resolver/DefinitionDocumentResolverFromDefinitionTest.java
index 7dcfd088..f45d6e3f 100644
--- a/swagger2markup/src/test/java/io/github/swagger2markup/internal/resolver/DefinitionDocumentResolverFromDefinitionTest.java
+++ b/swagger2markup/src/test/java/io/github/swagger2markup/internal/resolver/DefinitionDocumentResolverFromDefinitionTest.java
@@ -18,7 +18,7 @@ package io.github.swagger2markup.internal.resolver;
 import io.github.swagger2markup.Swagger2MarkupConfig;
 import io.github.swagger2markup.Swagger2MarkupConverter;
 import io.github.swagger2markup.builder.Swagger2MarkupConfigBuilder;
-import io.github.swagger2markup.config.MarkupLanguage;
+import io.github.swagger2markup.MarkupLanguage;
 import org.junit.Test;
 
 import java.nio.file.Paths;
diff --git a/swagger2markup/src/test/java/io/github/swagger2markup/internal/resolver/DefinitionDocumentResolverFromOperationTest.java b/swagger2markup/src/test/java/io/github/swagger2markup/internal/resolver/DefinitionDocumentResolverFromOperationTest.java
index b4e3b454..b994aea0 100644
--- a/swagger2markup/src/test/java/io/github/swagger2markup/internal/resolver/DefinitionDocumentResolverFromOperationTest.java
+++ b/swagger2markup/src/test/java/io/github/swagger2markup/internal/resolver/DefinitionDocumentResolverFromOperationTest.java
@@ -18,7 +18,7 @@ package io.github.swagger2markup.internal.resolver;
 import io.github.swagger2markup.Swagger2MarkupConfig;
 import io.github.swagger2markup.Swagger2MarkupConverter;
 import io.github.swagger2markup.builder.Swagger2MarkupConfigBuilder;
-import io.github.swagger2markup.config.MarkupLanguage;
+import io.github.swagger2markup.MarkupLanguage;
 import org.junit.Test;
 
 import java.nio.file.FileSystems;
diff --git a/swagger2markup/src/test/java/io/github/swagger2markup/internal/resolver/OperationDocumentNameResolverTest.java b/swagger2markup/src/test/java/io/github/swagger2markup/internal/resolver/OperationDocumentNameResolverTest.java
index 94b34e27..813ee188 100644
--- a/swagger2markup/src/test/java/io/github/swagger2markup/internal/resolver/OperationDocumentNameResolverTest.java
+++ b/swagger2markup/src/test/java/io/github/swagger2markup/internal/resolver/OperationDocumentNameResolverTest.java
@@ -18,7 +18,7 @@ package io.github.swagger2markup.internal.resolver;
 import io.github.swagger2markup.Swagger2MarkupConfig;
 import io.github.swagger2markup.Swagger2MarkupConverter;
 import io.github.swagger2markup.builder.Swagger2MarkupConfigBuilder;
-import io.github.swagger2markup.config.MarkupLanguage;
+import io.github.swagger2markup.MarkupLanguage;
 import io.github.swagger2markup.model.SwaggerPathOperation;
 import io.swagger.models.HttpMethod;
 import io.swagger.models.Operation;
diff --git a/swagger2markup/src/test/java/io/github/swagger2markup/internal/resolver/OperationDocumentResolverDefaultTest.java b/swagger2markup/src/test/java/io/github/swagger2markup/internal/resolver/OperationDocumentResolverDefaultTest.java
index 9e359306..42f3abee 100644
--- a/swagger2markup/src/test/java/io/github/swagger2markup/internal/resolver/OperationDocumentResolverDefaultTest.java
+++ b/swagger2markup/src/test/java/io/github/swagger2markup/internal/resolver/OperationDocumentResolverDefaultTest.java
@@ -18,7 +18,7 @@ package io.github.swagger2markup.internal.resolver;
 import io.github.swagger2markup.Swagger2MarkupConfig;
 import io.github.swagger2markup.Swagger2MarkupConverter;
 import io.github.swagger2markup.builder.Swagger2MarkupConfigBuilder;
-import io.github.swagger2markup.config.MarkupLanguage;
+import io.github.swagger2markup.MarkupLanguage;
 import io.github.swagger2markup.model.PathOperation;
 import io.github.swagger2markup.model.SwaggerPathOperation;
 import io.swagger.models.HttpMethod;
diff --git a/swagger2markup/src/test/java/io/github/swagger2markup/internal/resolver/SecurityDocumentResolverTest.java b/swagger2markup/src/test/java/io/github/swagger2markup/internal/resolver/SecurityDocumentResolverTest.java
index 7fc4d726..5e3880ac 100644
--- a/swagger2markup/src/test/java/io/github/swagger2markup/internal/resolver/SecurityDocumentResolverTest.java
+++ b/swagger2markup/src/test/java/io/github/swagger2markup/internal/resolver/SecurityDocumentResolverTest.java
@@ -18,7 +18,7 @@ package io.github.swagger2markup.internal.resolver;
 import io.github.swagger2markup.Swagger2MarkupConfig;
 import io.github.swagger2markup.Swagger2MarkupConverter;
 import io.github.swagger2markup.builder.Swagger2MarkupConfigBuilder;
-import io.github.swagger2markup.config.MarkupLanguage;
+import io.github.swagger2markup.MarkupLanguage;
 import org.junit.Test;
 
 import java.nio.file.Paths;