diff --git a/.gitignore b/.gitignore
index af7b7b6e08..6a3d41f624 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,8 @@
 !.idea/copyright/Bitsquare_Affero_GPLv3.xml
 !.idea/copyright/profiles_settings.xml
 !.idea/codeStyleSettings.xml
-bitsquare.iml
+*.iml
+*/*.iml
 *.spvchain
 *.wallet
 *.ser
diff --git a/common/common.iml b/common/common.iml
deleted file mode 100644
index 919568961a..0000000000
--- a/common/common.iml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.bitcoinj:bitcoinj-core:0.12.2" level="project" />
-    <orderEntry type="library" name="Maven: com.madgag.spongycastle:core:1.51.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:2.5.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:2.0.1" level="project" />
-    <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.lambdaworks:scrypt:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.bitcoinj:orchid:1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.6" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:16.0.1" level="project" />
-    <orderEntry type="library" name="Maven: junit:junit:4.11" level="project" />
-    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Maven: org.mockito:mockito-core:1.10.19" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.objenesis:objenesis:2.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-test:4.1.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.1.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.3" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/gui/gui.iml b/gui/gui.iml
deleted file mode 100644
index e9b3c0773d..0000000000
--- a/gui/gui.iml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/../client/target" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="common" />
-    <orderEntry type="module" module-name="common" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.2" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.6" level="project" />
-    <orderEntry type="library" name="Maven: net.tomp2p:tomp2p-all:5.0-Beta3" level="project" />
-    <orderEntry type="library" name="Maven: net.tomp2p:tomp2p-core:5.0-Beta3" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.0.25.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.0.25.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.0.25.Final" level="project" />
-    <orderEntry type="library" name="Maven: net.tomp2p:tomp2p-nat:5.0-Beta3" level="project" />
-    <orderEntry type="library" name="Maven: org.bitlet:weupnp:0.1.2" level="project" />
-    <orderEntry type="library" name="Maven: com.ganyo:gcm-server:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1" level="project" />
-    <orderEntry type="library" name="Maven: net.tomp2p:tomp2p-android:5.0-Beta3" level="project" />
-    <orderEntry type="library" name="Maven: net.tomp2p:tomp2p-replication:5.0-Beta3" level="project" />
-    <orderEntry type="library" name="Maven: net.tomp2p:tomp2p-storage:5.0-Beta3" level="project" />
-    <orderEntry type="library" name="Maven: org.mapdb:mapdb:1.0.6" level="project" />
-    <orderEntry type="library" name="Maven: net.tomp2p:tomp2p-dht:5.0-Beta3" level="project" />
-    <orderEntry type="library" name="Maven: net.tomp2p:tomp2p-tracker:5.0-Beta3" level="project" />
-    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.1.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.3" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.jopt-simple:jopt-simple:4.8" level="project" />
-    <orderEntry type="library" name="Maven: com.google.inject:guice:3.0" level="project" />
-    <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.2.4" level="project" />
-    <orderEntry type="library" name="Maven: org.controlsfx:controlsfx:8.0.6_20" level="project" />
-    <orderEntry type="library" name="Maven: de.jensd:fontawesomefx:8.0.0" level="project" />
-    <orderEntry type="library" name="Maven: net.glxn:qrgen:1.3" level="project" />
-    <orderEntry type="library" name="Maven: com.google.zxing:javase:2.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.zxing:core:2.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:2.0.1" level="project" />
-    <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" name="Maven: eu.hansolo.enzo:Enzo:0.1.5" level="project" />
-    <orderEntry type="library" name="Maven: org.fxmisc.easybind:easybind:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: com.vinumeris:updatefx:1.2" level="project" />
-    <orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:2.5.0" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-jdk14:1.7.6" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.trove4j:trove4j:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.51" level="project" />
-    <orderEntry type="library" name="Maven: org.bitcoinj:bitcoinj-core:0.12.2" level="project" />
-    <orderEntry type="library" name="Maven: com.madgag.spongycastle:core:1.51.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.lambdaworks:scrypt:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.bitcoinj:orchid:1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:16.0.1" level="project" />
-    <orderEntry type="library" name="Maven: junit:junit:4.11" level="project" />
-    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Maven: org.mockito:mockito-core:1.10.19" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.objenesis:objenesis:2.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-test:4.1.1.RELEASE" level="project" />
-  </component>
-</module>
\ No newline at end of file