move src to src/main/kotlin
Merge branch 'master'