diff --git a/.gitignore b/.gitignore
index d72d2807f02..2f8dbf78980 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,4 +34,4 @@ proto/compiler/google/src/google/protobuf/compiler/kotlin/bin
 proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc
 
 # translator auto generated artifacts
-kotstd/lib/arm/memory.ll
+kotstd/ll
diff --git a/kotstd/Makefile b/kotstd/Makefile
index 56b86a69890..96cc6f46659 100644
--- a/kotstd/Makefile
+++ b/kotstd/Makefile
@@ -1,10 +1,10 @@
 
 BUILD_DIR=$(PWD)/build
 INCLUDE_DIR=$(PWD)/include
-LIB_DIR=$(PWD)/lib
+LIB_DIR=$(PWD)/ll
 LIB_ARM_DIR=$(LIB_DIR)/arm
 LIB_X86_DIR=$(LIB_DIR)/x86
-LIBC=$(PWD)/libc
+LIBC=$(PWD)/c
 LLVM_ARM_FILES = $(patsubst $(LIBC)/%.c,$(LIB_ARM_DIR)/%.ll,$(wildcard $(LIBC)/*.c))
 LLVM_X86_FILES = $(patsubst $(LIBC)/%.c,$(LIB_X86_DIR)/%.ll,$(wildcard $(LIBC)/*.c))
 
@@ -53,8 +53,5 @@ clean:
 	rm -rf $(BUILD_DIR)
 	rm -rf $(LIB_DIR)
 
-aaa:
-	@echo $(LLVM_ARM_FILES)
-
 .PHONY: all clean
 
diff --git a/kotstd/libc/arm.c b/kotstd/c/arm.c
similarity index 100%
rename from kotstd/libc/arm.c
rename to kotstd/c/arm.c
diff --git a/kotstd/libc/array_c.c b/kotstd/c/array_c.c
similarity index 100%
rename from kotstd/libc/array_c.c
rename to kotstd/c/array_c.c
diff --git a/kotstd/libc/assert_c.c b/kotstd/c/assert_c.c
similarity index 100%
rename from kotstd/libc/assert_c.c
rename to kotstd/c/assert_c.c
diff --git a/kotstd/libc/console_c.c b/kotstd/c/console_c.c
similarity index 100%
rename from kotstd/libc/console_c.c
rename to kotstd/c/console_c.c
diff --git a/kotstd/libc/memory.c b/kotstd/c/memory.c
similarity index 100%
rename from kotstd/libc/memory.c
rename to kotstd/c/memory.c
diff --git a/kotstd/libc/primitives_c.c b/kotstd/c/primitives_c.c
similarity index 100%
rename from kotstd/libc/primitives_c.c
rename to kotstd/c/primitives_c.c
diff --git a/kotstd/include/Assert.kt b/kotstd/kt/Assert.kt
similarity index 100%
rename from kotstd/include/Assert.kt
rename to kotstd/kt/Assert.kt
diff --git a/kotstd/include/BooleanArray.kt b/kotstd/kt/BooleanArray.kt
similarity index 100%
rename from kotstd/include/BooleanArray.kt
rename to kotstd/kt/BooleanArray.kt
diff --git a/kotstd/include/ByteArray.kt b/kotstd/kt/ByteArray.kt
similarity index 100%
rename from kotstd/include/ByteArray.kt
rename to kotstd/kt/ByteArray.kt
diff --git a/kotstd/include/CodedInputStream.kt b/kotstd/kt/CodedInputStream.kt
similarity index 100%
rename from kotstd/include/CodedInputStream.kt
rename to kotstd/kt/CodedInputStream.kt
diff --git a/kotstd/include/CodedOutputStream.kt b/kotstd/kt/CodedOutputStream.kt
similarity index 100%
rename from kotstd/include/CodedOutputStream.kt
rename to kotstd/kt/CodedOutputStream.kt
diff --git a/kotstd/include/Console.kt b/kotstd/kt/Console.kt
similarity index 100%
rename from kotstd/include/Console.kt
rename to kotstd/kt/Console.kt
diff --git a/kotstd/include/IntArray.kt b/kotstd/kt/IntArray.kt
similarity index 100%
rename from kotstd/include/IntArray.kt
rename to kotstd/kt/IntArray.kt
diff --git a/kotstd/include/Iterators.kt b/kotstd/kt/Iterators.kt
similarity index 100%
rename from kotstd/include/Iterators.kt
rename to kotstd/kt/Iterators.kt
diff --git a/kotstd/include/KotlinInputStream.kt b/kotstd/kt/KotlinInputStream.kt
similarity index 100%
rename from kotstd/include/KotlinInputStream.kt
rename to kotstd/kt/KotlinInputStream.kt
diff --git a/kotstd/include/KotlinOutputStream.kt b/kotstd/kt/KotlinOutputStream.kt
similarity index 100%
rename from kotstd/include/KotlinOutputStream.kt
rename to kotstd/kt/KotlinOutputStream.kt
diff --git a/kotstd/include/LongArray.kt b/kotstd/kt/LongArray.kt
similarity index 100%
rename from kotstd/include/LongArray.kt
rename to kotstd/kt/LongArray.kt
diff --git a/kotstd/include/Primitives.kt b/kotstd/kt/Primitives.kt
similarity index 100%
rename from kotstd/include/Primitives.kt
rename to kotstd/kt/Primitives.kt
diff --git a/kotstd/include/Progressions.kt b/kotstd/kt/Progressions.kt
similarity index 100%
rename from kotstd/include/Progressions.kt
rename to kotstd/kt/Progressions.kt
diff --git a/kotstd/include/Ranges.kt b/kotstd/kt/Ranges.kt
similarity index 100%
rename from kotstd/include/Ranges.kt
rename to kotstd/kt/Ranges.kt
diff --git a/kotstd/include/ShortArray.kt b/kotstd/kt/ShortArray.kt
similarity index 100%
rename from kotstd/include/ShortArray.kt
rename to kotstd/kt/ShortArray.kt
diff --git a/kotstd/include/WireFormat.kt b/kotstd/kt/WireFormat.kt
similarity index 100%
rename from kotstd/include/WireFormat.kt
rename to kotstd/kt/WireFormat.kt
diff --git a/kotstd/include/WireType.kt b/kotstd/kt/WireType.kt
similarity index 100%
rename from kotstd/include/WireType.kt
rename to kotstd/kt/WireType.kt
diff --git a/kotstd/include/progressionUtil.kt b/kotstd/kt/progressionUtil.kt
similarity index 100%
rename from kotstd/include/progressionUtil.kt
rename to kotstd/kt/progressionUtil.kt
diff --git a/translator/Makefile b/translator/Makefile
index 224f39eed52..dee97cb2ef8 100644
--- a/translator/Makefile
+++ b/translator/Makefile
@@ -16,6 +16,15 @@ stdlib:
 tests: stdlib $(OBJECTS)
 	@date
 
-.DEFAULT_GOAL := tests
 
-.PHONY: tests, stdlib
+build:
+	./gradlew jar
+
+all: build tests;
+
+clean:
+	./gradlew clean
+
+.DEFAULT_GOAL := all
+.FORCE: build, all
+.PHONY: tests, stdlib, build, all
diff --git a/translator/run_one_test.sh b/translator/run_one_test.sh
index 661e12035b7..cd3cb154876 100755
--- a/translator/run_one_test.sh
+++ b/translator/run_one_test.sh
@@ -3,6 +3,7 @@ green='\033[0;32m'
 red='\033[0;31m'
 lightRed='\033[1;31m'
 orange='\033[0;33m'
+KOTSTD='../kotstd/kt'
 
 cd ../translator
 
@@ -57,7 +58,7 @@ if [ -f "$DIRECTORY/$TEST/$TEST.c" ]
 	fi
 fi
 
-java -jar build/libs/translator-1.0.jar -I ../kotstd/include $DIRECTORY/$TEST/$TEST.kt > $DIRECTORY/$TEST/linked/$TEST.ll
+java -jar build/libs/translator-1.0.jar -I $KOTSTD $DIRECTORY/$TEST/$TEST.kt > $DIRECTORY/$TEST/linked/$TEST.ll
 
 if [ $? -ne 0 ]; then
 	echo -e "${orange}test: ${TEST}${nc}"
diff --git a/translator/run_tests.sh b/translator/run_tests.sh
index 7fbde6e82ef..d9ff0f3031b 100755
--- a/translator/run_tests.sh
+++ b/translator/run_tests.sh
@@ -4,6 +4,7 @@ red='\033[0;31m'
 lightRed='\033[1;31m'
 orange='\033[0;33m'
 nc='\033[0m'
+KOTSTD='../kotstd/kt'
 
 if [ "$3" == "--debug" ]; then
     cd ../kotstd && make clean && make debug
@@ -74,7 +75,7 @@ for i in $TESTS; do
 		fi
 	fi
 
-    java -jar build/libs/translator-1.0.jar -I ../kotstd/include $DIRECTORY/$TEST/$TEST.kt > $DIRECTORY/$TEST/linked/$TEST.ll
+    java -jar build/libs/translator-1.0.jar -I $KOTSTD  $DIRECTORY/$TEST/$TEST.kt > $DIRECTORY/$TEST/linked/$TEST.ll
 
 	if [ $? -ne 0 ]; then
 		echo -e "${red}Translation error: ${DIRECTORY}/$TEST/${TEST}.kt${nc}"