diff --git a/build.gradle b/build.gradle
index 549ee37..a208e46 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,20 +25,20 @@ dependencies {
 sourceSets {
     main {
         kotlin {
-            srcDir 'src'
+            srcDir 'src/main'
         }
     }
     test {
         kotlin {
-            srcDir 'test'
+            srcDir 'src/test'
         }
     }
 }
 
 idea.module {
     name = "parserCombinators"
-    sourceDirs += file('src')
-    testSourceDirs += file('test')
+    sourceDirs += file('src/main')
+    testSourceDirs += file('src/test')
 }
 
 task setup {
diff --git a/src/main/podkopaev/net/basicComb.kt b/src/main/net/podkopaev/basicComb.kt
similarity index 99%
rename from src/main/podkopaev/net/basicComb.kt
rename to src/main/net/podkopaev/basicComb.kt
index f375fbf..0858e48 100644
--- a/src/main/podkopaev/net/basicComb.kt
+++ b/src/main/net/podkopaev/basicComb.kt
@@ -1,4 +1,4 @@
-package podkopaev.net
+package net.podkopaev
 
 import java.util.*
 
diff --git a/test/podkopaev/net/BasicCombTest.kt b/src/test/net/podkopaev/BasicCombTest.kt
similarity index 97%
rename from test/podkopaev/net/BasicCombTest.kt
rename to src/test/net/podkopaev/BasicCombTest.kt
index 8bb4b3d..4fa92a4 100644
--- a/test/podkopaev/net/BasicCombTest.kt
+++ b/src/test/net/podkopaev/BasicCombTest.kt
@@ -1,4 +1,4 @@
-package podkopaev.net
+package net.podkopaev
 
 import org.junit.Assert
 import org.junit.Test