diff --git a/app/src/main/java/ru/noties/markwon/MarkdownRenderer.java b/app/src/main/java/ru/noties/markwon/MarkdownRenderer.java
index 3e037b49..119ba82c 100644
--- a/app/src/main/java/ru/noties/markwon/MarkdownRenderer.java
+++ b/app/src/main/java/ru/noties/markwon/MarkdownRenderer.java
@@ -19,8 +19,8 @@ import javax.inject.Inject;
 import ru.noties.debug.Debug;
 import ru.noties.markwon.spans.AsyncDrawable;
 import ru.noties.markwon.spans.SpannableTheme;
-import ru.noties.markwon.spans.heading.HeadingConfig;
-import ru.noties.markwon.spans.heading.HeadingTypeConfig;
+import ru.noties.markwon.spans.configuration.heading.HeadingConfig;
+import ru.noties.markwon.spans.configuration.heading.HeadingTypeConfig;
 
 @ActivityScope
 public class MarkdownRenderer {
diff --git a/library/src/main/java/ru/noties/markwon/spans/HeadingSpan.java b/library/src/main/java/ru/noties/markwon/spans/HeadingSpan.java
index 365fa7cb..85b339c8 100644
--- a/library/src/main/java/ru/noties/markwon/spans/HeadingSpan.java
+++ b/library/src/main/java/ru/noties/markwon/spans/HeadingSpan.java
@@ -10,7 +10,7 @@ import android.text.TextPaint;
 import android.text.style.LeadingMarginSpan;
 import android.text.style.MetricAffectingSpan;
 
-import ru.noties.markwon.spans.heading.HeadingType;
+import ru.noties.markwon.spans.configuration.heading.HeadingType;
 
 public class HeadingSpan extends MetricAffectingSpan implements LeadingMarginSpan {
 
diff --git a/library/src/main/java/ru/noties/markwon/spans/SpannableTheme.java b/library/src/main/java/ru/noties/markwon/spans/SpannableTheme.java
index df6ab515..62eb35b1 100644
--- a/library/src/main/java/ru/noties/markwon/spans/SpannableTheme.java
+++ b/library/src/main/java/ru/noties/markwon/spans/SpannableTheme.java
@@ -14,9 +14,9 @@ import android.support.annotation.Nullable;
 import android.text.TextPaint;
 import android.util.TypedValue;
 
-import ru.noties.markwon.spans.heading.HeadingConfig;
-import ru.noties.markwon.spans.heading.HeadingType;
-import ru.noties.markwon.spans.heading.HeadingTypeConfig;
+import ru.noties.markwon.spans.configuration.heading.HeadingConfig;
+import ru.noties.markwon.spans.configuration.heading.HeadingType;
+import ru.noties.markwon.spans.configuration.heading.HeadingTypeConfig;
 
 @SuppressWarnings("WeakerAccess")
 public class SpannableTheme {
diff --git a/library/src/main/java/ru/noties/markwon/spans/heading/HeadingConfig.kt b/library/src/main/java/ru/noties/markwon/spans/configuration/heading/HeadingConfig.kt
similarity index 96%
rename from library/src/main/java/ru/noties/markwon/spans/heading/HeadingConfig.kt
rename to library/src/main/java/ru/noties/markwon/spans/configuration/heading/HeadingConfig.kt
index 6676dc20..1e9e0c5b 100644
--- a/library/src/main/java/ru/noties/markwon/spans/heading/HeadingConfig.kt
+++ b/library/src/main/java/ru/noties/markwon/spans/configuration/heading/HeadingConfig.kt
@@ -1,4 +1,4 @@
-package ru.noties.markwon.spans.heading
+package ru.noties.markwon.spans.configuration.heading
 
 import android.graphics.Typeface
 import android.support.annotation.ColorInt
@@ -18,7 +18,7 @@ import android.support.annotation.Dimension
  * @property h6Config Config for H6 heading
  * @property headingBreakConfig Config for line breaks (for H1 and H2)
  */
-data class HeadingConfig @JvmOverloads constructor(
+class HeadingConfig @JvmOverloads constructor(
         val h1Config: HeadingTypeConfig = HeadingTypeConfig(),
         val h2Config: HeadingTypeConfig = HeadingTypeConfig(),
         val h3Config: HeadingTypeConfig = HeadingTypeConfig(),
diff --git a/library/src/main/java/ru/noties/markwon/spans/configuration/heading/HeadingType.java b/library/src/main/java/ru/noties/markwon/spans/configuration/heading/HeadingType.java
new file mode 100644
index 00000000..69e151e1
--- /dev/null
+++ b/library/src/main/java/ru/noties/markwon/spans/configuration/heading/HeadingType.java
@@ -0,0 +1,27 @@
+package ru.noties.markwon.spans.configuration.heading;
+
+import android.support.annotation.IntDef;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import static ru.noties.markwon.spans.configuration.heading.HeadingType.H1;
+import static ru.noties.markwon.spans.configuration.heading.HeadingType.H2;
+import static ru.noties.markwon.spans.configuration.heading.HeadingType.H3;
+import static ru.noties.markwon.spans.configuration.heading.HeadingType.H4;
+import static ru.noties.markwon.spans.configuration.heading.HeadingType.H5;
+import static ru.noties.markwon.spans.configuration.heading.HeadingType.H6;
+
+/**
+ * Created by daniel.leal on 13.12.17.
+ */
+@Retention(RetentionPolicy.SOURCE)
+@IntDef({H1, H2, H3, H4, H5, H6})
+public @interface HeadingType {
+    int H1 = 1;
+    int H2 = 2;
+    int H3 = 3;
+    int H4 = 4;
+    int H5 = 5;
+    int H6 = 6;
+}
diff --git a/library/src/main/java/ru/noties/markwon/spans/heading/HeadingType.java b/library/src/main/java/ru/noties/markwon/spans/heading/HeadingType.java
deleted file mode 100644
index 38a2f460..00000000
--- a/library/src/main/java/ru/noties/markwon/spans/heading/HeadingType.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package ru.noties.markwon.spans.heading;
-
-import android.support.annotation.IntDef;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-import static ru.noties.markwon.spans.heading.HeadingType.H1;
-import static ru.noties.markwon.spans.heading.HeadingType.H2;
-import static ru.noties.markwon.spans.heading.HeadingType.H3;
-import static ru.noties.markwon.spans.heading.HeadingType.H4;
-import static ru.noties.markwon.spans.heading.HeadingType.H5;
-import static ru.noties.markwon.spans.heading.HeadingType.H6;
-
-/**
- * Created by daniel.leal on 13.12.17.
- */
-@Retention(RetentionPolicy.SOURCE)
-@IntDef({H1, H2, H3, H4, H5, H6})
-public @interface HeadingType {
-    int H1 = 1;
-    int H2 = 2;
-    int H3 = 3;
-    int H4 = 4;
-    int H5 = 5;
-    int H6 = 6;
-}