diff --git a/samples/calculator/README.md b/samples/calculator/README.md
index 77ff145d6e4..da677b6ba1f 100644
--- a/samples/calculator/README.md
+++ b/samples/calculator/README.md
@@ -1,6 +1,6 @@
 # Calculator sample
 
-This example shows how to use Kotlin library (located in [`src`](src/)) in different environments.
+This example shows how to use Kotlin library (located in [parser/src](parser/src/)) in different environments.
 Currently for
 * iOS (see [calculator](calculator/))
 * plain JVM (cli) (see [jvmCliApp](jvmCliApp/))
@@ -28,26 +28,26 @@ The sample consists of:
 2.  Kotlin library source code and build script. It is built into Objective-C
     framework by invoking Gradle from custom "Run Script" build phase, and this
     framework is imported into the Xcode project.
-    
+
 ## Using the same code with Kotlin/JVM
 The library can also be compiled to a `.jar` by Kotlin/JVM compiler with Gradle. 
-Just run from the [sample root dir](../): 
+Just run from the [library dir](parser/): 
 ```
-./gradlew calculator:jar
+../../gradlew jar
 ```
-This will generate a `calculator.jar` in `build/libs/`.
-    
+This will generate an `arithmetic-parser.jar` in `parser/build/libs/`.
+
 ## Plain JVM
 The plain jvm sample (written in Kotlin/JVM) will use the library as a gradle dependency.
 
-To build and run it, use
+To build and run it, go to [jvmCliApp](jvmCliApp/) directory and use
 ```
-./gradlew calculator:jvmCliApp:run
+../../gradlew run
 ```
 
 To build the distribution:
 ```
-./gradlew calculator:jvmCliApp:distZip
+../../gradlew distZip
 ```
 (the result will be available as
 `jvmCliApp/build/distributions/KotlinCalculator.zip`)
@@ -57,5 +57,5 @@ The Android App uses - similar to the plain JVM sample - the library as a gradle
 
 To build and run the Android sample do the following:
 
-1.  Open `samples/` in Android Studio
-2.  Now build and run the androidApp application 
\ No newline at end of file
+1.  Open `samples/calculator/androidApp` in Android Studio
+2.  Now build and run the androidApp application
diff --git a/samples/calculator/androidApp/build.gradle b/samples/calculator/androidApp/build.gradle
index b091d60dc52..6fd773b2a2f 100644
--- a/samples/calculator/androidApp/build.gradle
+++ b/samples/calculator/androidApp/build.gradle
@@ -1,3 +1,17 @@
+buildscript {
+    ext.kotlin_version = '1.2.21'
+
+    repositories {
+        google()
+        jcenter()
+    }
+
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath 'com.android.tools.build:gradle:3.0.1'
+    }
+}
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
@@ -10,6 +24,10 @@ android {
         versionCode 1
         versionName "1.0.0"
     }
+
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
+    }
 }
 
 repositories {
@@ -19,7 +37,7 @@ repositories {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation project.parent
+    implementation "org.jetbrains.kotlin.konan.samples:arithmetic-parser"
 
     implementation "com.android.support:appcompat-v7:27.0.2"
 }
diff --git a/samples/calculator/androidApp/gradle/wrapper/gradle-wrapper.jar b/samples/calculator/androidApp/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000000..13372aef5e2
Binary files /dev/null and b/samples/calculator/androidApp/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/samples/calculator/androidApp/gradle/wrapper/gradle-wrapper.properties b/samples/calculator/androidApp/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000000..7c1bd6f3ea9
--- /dev/null
+++ b/samples/calculator/androidApp/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Tue Jan 30 14:33:12 MSK 2018
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
diff --git a/samples/calculator/androidApp/gradlew b/samples/calculator/androidApp/gradlew
new file mode 100644
index 00000000000..9d82f789151
--- /dev/null
+++ b/samples/calculator/androidApp/gradlew
@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/samples/calculator/androidApp/gradlew.bat b/samples/calculator/androidApp/gradlew.bat
new file mode 100644
index 00000000000..aec99730b4e
--- /dev/null
+++ b/samples/calculator/androidApp/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/samples/calculator/androidApp/settings.gradle b/samples/calculator/androidApp/settings.gradle
new file mode 100644
index 00000000000..b1ad6b6bedf
--- /dev/null
+++ b/samples/calculator/androidApp/settings.gradle
@@ -0,0 +1 @@
+includeBuild '../parser'
diff --git a/samples/calculator/build.gradle b/samples/calculator/build.gradle
index 398d6e4a6dd..f7ac02857f3 100644
--- a/samples/calculator/build.gradle
+++ b/samples/calculator/build.gradle
@@ -1,31 +1,9 @@
-buildscript {
-    ext.kotlin_version = '1.2.0'
-
-    repositories {
-        google()
-        jcenter()
-    }
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:3.0.1'
-    }
-}
-
-apply plugin: 'kotlin'
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib"
-}
-
 apply plugin: 'konan'
 
 konan.targets = ['iphone', 'iphone_sim']
 
 konanArtifacts {
-    framework('KotlinArithmeticParser')
+    framework('KotlinArithmeticParser') {
+        srcDir 'parser/src/main/kotlin'
+    }
 }
diff --git a/samples/calculator/jvmCliApp/build.gradle b/samples/calculator/jvmCliApp/build.gradle
index 38d41c3fe4e..6b8a1a59056 100644
--- a/samples/calculator/jvmCliApp/build.gradle
+++ b/samples/calculator/jvmCliApp/build.gradle
@@ -1,4 +1,10 @@
 buildscript {
+    ext.kotlin_version = '1.2.21'
+
+    repositories {
+        mavenCentral()
+    }
+
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
@@ -13,7 +19,7 @@ repositories {
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib"
-    compile project.parent
+    compile "org.jetbrains.kotlin.konan.samples:arithmetic-parser"
 }
 
 applicationName = "KotlinCalculator"
diff --git a/samples/calculator/jvmCliApp/settings.gradle b/samples/calculator/jvmCliApp/settings.gradle
new file mode 100644
index 00000000000..b1ad6b6bedf
--- /dev/null
+++ b/samples/calculator/jvmCliApp/settings.gradle
@@ -0,0 +1 @@
+includeBuild '../parser'
diff --git a/samples/calculator/parser/build.gradle b/samples/calculator/parser/build.gradle
new file mode 100644
index 00000000000..53b555ad863
--- /dev/null
+++ b/samples/calculator/parser/build.gradle
@@ -0,0 +1,23 @@
+buildscript {
+    ext.kotlin_version = '1.2.21'
+
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
+apply plugin: 'kotlin'
+
+group = 'org.jetbrains.kotlin.konan.samples'
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    compile "org.jetbrains.kotlin:kotlin-stdlib"
+}
diff --git a/samples/calculator/parser/settings.gradle b/samples/calculator/parser/settings.gradle
new file mode 100644
index 00000000000..b18ac817593
--- /dev/null
+++ b/samples/calculator/parser/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'arithmetic-parser'
diff --git a/samples/calculator/src/main/kotlin/org/konan/arithmeticparser/Parser.kt b/samples/calculator/parser/src/main/kotlin/org/konan/arithmeticparser/Parser.kt
similarity index 100%
rename from samples/calculator/src/main/kotlin/org/konan/arithmeticparser/Parser.kt
rename to samples/calculator/parser/src/main/kotlin/org/konan/arithmeticparser/Parser.kt
diff --git a/samples/settings.gradle b/samples/settings.gradle
index ea291754f9d..34b50304831 100644
--- a/samples/settings.gradle
+++ b/samples/settings.gradle
@@ -1,8 +1,6 @@
 // NOTE: If a new sample uses only platform libs,
 // please add it into the 'buildSamplesWithPlatfromLibs' task in build.gradle.
 include ':calculator'
-include ':calculator:jvmCliApp'
-// include ':calculator:androidApp'
 include ':csvparser'
 include ':gitchurn'
 include ':globalState'