diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml
deleted file mode 100644
index 75d6a0c..0000000
--- a/.idea/checkstyle-idea.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CheckStyle-IDEA">
-    <option name="configuration">
-      <map>
-        <entry key="checkstyle-version" value="8.10.1" />
-        <entry key="copy-libs" value="false" />
-        <entry key="location-0" value="BUNDLED:(bundled):Sun Checks" />
-        <entry key="location-1" value="BUNDLED:(bundled):Google Checks" />
-        <entry key="scan-before-checkin" value="false" />
-        <entry key="scanscope" value="JavaOnly" />
-        <entry key="suppress-errors" value="false" />
-      </map>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index db291c6..0d15693 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -19,6 +19,9 @@
       </option>
     </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
       <arrangement>
         <rules>
           <section>
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index 97626ba..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 6784f70..0380d8d 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -26,20 +26,5 @@
       <option name="name" value="Google" />
       <option name="url" value="https://dl.google.com/dl/android/maven2/" />
     </remote-repository>
-    <remote-repository>
-      <option name="id" value="$USER_HOME$/Library/Android/sdk/extras/android/m2repository" />
-      <option name="name" value="$USER_HOME$/Library/Android/sdk/extras/android/m2repository" />
-      <option name="url" value="file:$USER_HOME$/Library/Android/sdk/extras/android/m2repository" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="$USER_HOME$/Library/Android/sdk/extras/m2repository" />
-      <option name="name" value="$USER_HOME$/Library/Android/sdk/extras/m2repository" />
-      <option name="url" value="file:$USER_HOME$/Library/Android/sdk/extras/m2repository" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="$USER_HOME$/Library/Android/sdk/extras/google/m2repository" />
-      <option name="name" value="$USER_HOME$/Library/Android/sdk/extras/google/m2repository" />
-      <option name="url" value="file:$USER_HOME$/Library/Android/sdk/extras/google/m2repository" />
-    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index bdbd83e..7bfef59 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,37 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="Bundled (Maven 3)" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="NullableNotNullManager">
-    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
-    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
-    <option name="myNullables">
-      <value>
-        <list size="5">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
-          <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
-        </list>
-      </value>
-    </option>
-    <option name="myNotNulls">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
-        </list>
-      </value>
-    </option>
-  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 129bf46..660dfe8 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,12 +2,9 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/Dispatcher.iml" filepath="$PROJECT_DIR$/Dispatcher.iml" />
-      <module fileurl="file://$PROJECT_DIR$/dispatcher/dispatcher.iml" filepath="$PROJECT_DIR$/dispatcher/dispatcher.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/dispatcher.iml" filepath="$PROJECT_DIR$/.idea/modules/dispatcher.iml" group="dispatcher" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/dispatcher/dispatcher-dispatcher.iml" filepath="$PROJECT_DIR$/.idea/modules/dispatcher/dispatcher-dispatcher.iml" group="dispatcher/dispatcher" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/dispatcher-sample/dispatcher-dispatcher-sample.iml" filepath="$PROJECT_DIR$/.idea/modules/dispatcher-sample/dispatcher-dispatcher-sample.iml" group="dispatcher/dispatcher-sample" />
-      <module fileurl="file://$PROJECT_DIR$/dispatcher-sample/dispatcher-sample.iml" filepath="$PROJECT_DIR$/dispatcher-sample/dispatcher-sample.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/oss-dispatcher.iml" filepath="$PROJECT_DIR$/.idea/modules/oss-dispatcher.iml" group="dispatcher" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/dispatcher-sample/dispatcher-sample.iml" filepath="$PROJECT_DIR$/.idea/modules/dispatcher-sample/dispatcher-sample.iml" group="dispatcher/dispatcher-sample" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>
\ No newline at end of file