diff --git a/.gitignore b/.gitignore
index 880659e5..070b9b13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,130 @@
-build
+.idea/.name
+.idea/vcs.xml
+
+# Created by https://www.gitignore.io/api/java,gradle,intellij+iml
+# Edit at https://www.gitignore.io/?templates=java,gradle,intellij+iml
+
+### Intellij+iml ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+# JetBrains templates
+**___jb_tmp___
+
+### Intellij+iml Patch ###
+# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023
+
+*.iml
+modules.xml
+.idea/misc.xml
+*.ipr
+
+### Java ###
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+### Gradle ###
 .gradle
-.idea
-/out
\ No newline at end of file
+build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Cache of project
+.gradletasknamecache
+
+# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
+# gradle/wrapper/gradle-wrapper.properties
+
+### Gradle Patch ###
+**/build/
+
+# End of https://www.gitignore.io/api/java,gradle,intellij+iml
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 00000000..1e57c8ba
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,65 @@
+image: gradle:alpine
+
+stages:
+  - test
+  - publish
+
+variables:
+  GRADLE_OPTS: "-Dorg.gradle.daemon=false"
+
+before_script:
+  - export GRADLE_USER_HOME=`pwd`/.gradle
+
+
+
+##############
+#    JOBS    #
+##############
+
+build:
+  stage: test
+  cache:
+    paths:
+      - build
+      - .gradle
+  script:
+    - gradle assemble
+
+test:
+  stage: test
+  cache:
+    paths:
+      - build
+      - .gradle
+  script:
+    - gradle jacocoTestReport coveralls
+
+bintray:publish:
+  stage: publish
+  cache:
+    paths:
+      - build
+      - .gradle
+  script:
+    - ./gradlew bintrayUpload
+  only:
+    - tags
+
+pages:
+  image: alpine/bundle:2.6.1
+  stage: publish
+  artifacts:
+    paths:
+      - public
+  cache:
+    paths:
+      - docs/vendor
+  variables:
+    JEKYLL_ENV: production
+    LC_ALL: C.UTF-8
+  script:
+    - cd docs
+    - bundle install --path vendor/bundle
+    - bundle exec jekyll build -d ../public
+  only:
+    - master
diff --git a/.idea/runConfigurations/Run_Tests.xml b/.idea/runConfigurations/Run_Tests.xml
new file mode 100644
index 00000000..301bfc22
--- /dev/null
+++ b/.idea/runConfigurations/Run_Tests.xml
@@ -0,0 +1,23 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Run Tests" type="JUnit" factoryName="JUnit">
+    <module name="kgraphql.test" />
+    <extension name="net.ashald.envfile">
+      <option name="IS_ENABLED" value="false" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" />
+      </ENTRIES>
+    </extension>
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="directory" />
+    <option name="PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+    <dir value="$PROJECT_DIR$/src/test/kotlin/com/apurebase/kgraphql" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 7bb80239..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-dist: trusty
-
-language: java
-
-jdk:
-  - oraclejdk8
-  - openjdk8
-
-after_success:
-- ./gradlew jacocoTestReport coveralls
\ No newline at end of file
diff --git a/README.MD b/README.MD
index 72c07fed..4ad37612 100644
--- a/README.MD
+++ b/README.MD
@@ -1,10 +1,5 @@
 # KGraphQL
-
-[![Build Status](https://travis-ci.org/pgutkowski/KGraphQL.svg?branch=master)](https://travis-ci.org/pgutkowski/KGraphQL)
-[![codebeat badge](https://codebeat.co/badges/b26d3c87-7cd1-4358-93cd-45d395669bdc)](https://codebeat.co/projects/github-com-pgutkowski-kgraphql-master)
-[![Coverage Status](https://coveralls.io/repos/github/pgutkowski/KGraphQL/badge.svg?branch=master)](https://coveralls.io/github/pgutkowski/KGraphQL?branch=master)
-[![Download](https://api.bintray.com/packages/pgutkowski/Maven/KGraphQL/images/download.svg) ](https://bintray.com/pgutkowski/Maven/KGraphQL/_latestVersion)
-[![Awesome Kotlin Badge](https://kotlin.link/awesome-kotlin.svg)](https://github.com/KotlinBy/awesome-kotlin)
+[![Bintray](https://api.bintray.com/packages/apurebase/apurebase/kgraphql/images/download.svg)](https://bintray.com/apurebase/apurebase/kgraphql)
 
 KGraphQL is [Kotlin](https://kotlinlang.org/) implementation of [GraphQL](http://graphql.org/). It provides rich DSL to setup GraphQL schema. 
 
@@ -84,13 +79,13 @@ val schema = KGraphQL.schema {
 Now, we can query our schema:
 ```kotlin
 //query for hero from episode JEDI and take id, name for any Character, and primaryFunction for Droid or height for Human
-schema.execute("{hero(episode: JEDI){
+schema.execute("""{hero(episode: JEDI){
                     id
                     name 
                     ... on Droid{primaryFunction} 
                     ... on Human{height}
                     }
-                }")
+                }""")
 ```
 Returns:
 ```json
@@ -107,13 +102,13 @@ Returns:
 Query for all heroes:
 ```kotlin
 //query for all heroes and take id, name for any Character, and primaryFunction for Droid or height for Human
-schema.execute("{heroes {
+schema.execute("""{heroes {
                     id 
                     name 
                     ... on Droid{primaryFunction} 
                     ... on Human{height}
                     }
-                }")
+                }""")
 ```
 Returns:
 ```json
@@ -145,17 +140,19 @@ KGraphQL is pushed to bintray repository and also linked to JCenter. It requires
 Add Bintray JCenter repository to <repositories> section:
 
 ```
-<repository>
-    <id>central</id>
-    <url>https://dl.bintray.com/pgutkowski/Maven</url>
-</repository>
+<repositories>
+    <repository>
+        <id>jcenter</id>
+        <url>https://jcenter.bintray.com/</url>
+    </repository>
+</repositories>
 ```
 
 Add dependency:
 
 ```
 <dependency>
-  <groupId>com.github.pgutkowski</groupId>
+  <groupId>com.apurebase</groupId>
   <artifactId>kgraphql</artifactId>
   <version>${KGraphQLVersion}</version>
 </dependency>
@@ -175,16 +172,14 @@ Add Bintray JCenter repository:
 
 ```
 repositories {
-    maven {
-        url  "https://dl.bintray.com/pgutkowski/Maven" 
-    }
+    jcenter()
 }
 ```
 
 Add dependencies (you can also add other modules that you need):
 
 ```
-compile 'com.github.pgutkowski:kgraphql:${KGraphQLVersion}'
+compile 'com.apurebase:kgraphql:${KGraphQLVersion}'
 ```
 
 And make sure that you use the right Kotlin version:
diff --git a/build.gradle b/build.gradle
index 998202a5..402f414f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
-group 'com.github.pgutkowski'
-version '0.3.0'
+group 'com.apurebase'
+version '0.4.1'
 
 buildscript {
     ext.kotlin_version = '1.3.10'
@@ -67,6 +67,15 @@ jacoco {
     toolVersion = "0.8.2"
 }
 
+task sourcesJar(type: Jar, dependsOn: classes) {
+    classifier = 'sources'
+    from sourceSets.main.allSource
+}
+
+artifacts {
+    archives sourcesJar
+}
+
 task sourceJar(type: Jar) {
     from sourceSets.main.allSource
 }
@@ -79,48 +88,41 @@ jacocoTestReport {
     }
 }
 
-publishing {
-    publications {
-        MyPublication(MavenPublication) {
-            from components.java
-
-            artifact sourceJar {
-                classifier "sources"
-            }
-
-            pom.withXml {
-                asNode().dependencies.'*'.findAll() {
-                    it.scope.text() == 'runtime' && project.configurations.compile.allDependencies.find { dep ->
-                        dep.name == it.artifactId.text()
-                    }
-                }.each() {
-                    it.scope*.value = 'compile'
-                }
-            }
-        }
-    }
-}
-
 bintray {
-    user = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER')
-    key = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY')
+    user = System.getenv('BINTRAY_USER')
+    key = System.getenv('BINTRAY_KEY')
 
+    publish = true
+    publications = ['MyPublication']
+    configurations = ['archives']
     pkg {
-        repo = 'Maven'
-        name = 'KGraphQL'
+        repo = 'apurebase'
+        name = 'kgraphql'
         licenses = ['MIT']
-        vcsUrl = 'https://github.com/pgutkowski/KGraphQL.git'
-        publications = ['MyPublication']
-
+        vcsUrl = 'git@github.com:aPureBase/KGraphQL.git'
+        websiteUrl = 'https://github.com/aPureBase/KGraphQL'
+        issueTrackerUrl = 'https://github.com/aPureBase/KGraphQL/issues'
         version {
-            name = '0.3.0'
-            desc = 'KGraphQL beta release'
-            released  = new Date()
-            vcsTag = '0.3.0'
+            name = project.version
+            released = new Date()
+        }
+    }
+
+    publishing {
+        publications {
+            MyPublication(MavenPublication) {
+                from components.java
+                groupId project.group
+                artifactId 'kgraphql'
+                artifact sourcesJar
+                version version
+            }
         }
     }
 }
 
+
+
 wrapper {
     gradleVersion = '4.10' //version required
 }
diff --git a/docs/.gitignore b/docs/.gitignore
new file mode 100644
index 00000000..c8bf76f5
--- /dev/null
+++ b/docs/.gitignore
@@ -0,0 +1,4 @@
+_site
+.sass-cache
+.jekyll-metadata
+vendor/
diff --git a/docs/404.html b/docs/404.html
new file mode 100644
index 00000000..790de828
--- /dev/null
+++ b/docs/404.html
@@ -0,0 +1,24 @@
+---
+layout: default
+---
+
+<style type="text/css" media="screen">
+    .container {
+        margin: 10px auto;
+        max-width: 600px;
+        text-align: center;
+    }
+    h1 {
+        margin: 30px 0;
+        font-size: 4em;
+        line-height: 1;
+        letter-spacing: -1px;
+    }
+</style>
+
+<div class="container">
+    <h1>404</h1>
+
+    <p><strong>Page not found :(</strong></p>
+    <p>The requested page could not be found.</p>
+</div>
diff --git a/docs/Gemfile b/docs/Gemfile
new file mode 100644
index 00000000..3295d057
--- /dev/null
+++ b/docs/Gemfile
@@ -0,0 +1,31 @@
+source "https://rubygems.org"
+
+# Hello! This is where you manage which Jekyll version is used to run.
+# When you want to use a different version, change it below, save the
+# file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
+#
+#     bundle exec jekyll serve
+#
+# This will help ensure the proper Jekyll version is running.
+# Happy Jekylling!
+gem "jekyll", "~> 3.8.5"
+
+# This is the default theme for new Jekyll sites. You may change this to anything you like.
+gem "minima", "~> 2.0"
+
+# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
+# uncomment the line below. To upgrade, run `bundle update github-pages`.
+# gem "github-pages", group: :jekyll_plugins
+
+# If you have any plugins, put them here!
+group :jekyll_plugins do
+  gem "jekyll-feed", "~> 0.6"
+  gem "just-the-docs"
+end
+
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+
+# Performance-booster for watching directories on Windows
+gem "wdm", "~> 0.1.0" if Gem.win_platform?
+
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
new file mode 100644
index 00000000..eecc9fc0
--- /dev/null
+++ b/docs/Gemfile.lock
@@ -0,0 +1,79 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
+    colorator (1.1.0)
+    concurrent-ruby (1.1.4)
+    em-websocket (0.5.1)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0.6.0)
+    eventmachine (1.2.7)
+    ffi (1.10.0)
+    forwardable-extended (2.6.0)
+    http_parser.rb (0.6.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    jekyll (3.8.5)
+      addressable (~> 2.4)
+      colorator (~> 1.0)
+      em-websocket (~> 0.5)
+      i18n (~> 0.7)
+      jekyll-sass-converter (~> 1.0)
+      jekyll-watch (~> 2.0)
+      kramdown (~> 1.14)
+      liquid (~> 4.0)
+      mercenary (~> 0.3.3)
+      pathutil (~> 0.9)
+      rouge (>= 1.7, < 4)
+      safe_yaml (~> 1.0)
+    jekyll-feed (0.11.0)
+      jekyll (~> 3.3)
+    jekyll-sass-converter (1.5.2)
+      sass (~> 3.4)
+    jekyll-seo-tag (2.5.0)
+      jekyll (~> 3.3)
+    jekyll-watch (2.1.2)
+      listen (~> 3.0)
+    just-the-docs (0.2.3)
+      jekyll (~> 3.8.5)
+      rake (~> 12.3.1)
+    kramdown (1.17.0)
+    liquid (4.0.1)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    mercenary (0.3.6)
+    minima (2.5.0)
+      jekyll (~> 3.5)
+      jekyll-feed (~> 0.9)
+      jekyll-seo-tag (~> 2.1)
+    pathutil (0.16.2)
+      forwardable-extended (~> 2.6)
+    public_suffix (3.0.3)
+    rake (12.3.2)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
+    rouge (3.3.0)
+    ruby_dep (1.5.0)
+    safe_yaml (1.0.4)
+    sass (3.7.3)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  jekyll (~> 3.8.5)
+  jekyll-feed (~> 0.6)
+  just-the-docs
+  minima (~> 2.0)
+  tzinfo-data
+
+BUNDLED WITH
+   2.0.1
diff --git a/docs/_config.yml b/docs/_config.yml
new file mode 100644
index 00000000..0cdbf8d1
--- /dev/null
+++ b/docs/_config.yml
@@ -0,0 +1,32 @@
+title: KGraphQL
+description: >-
+  Pure Kotlin GraphQL implementation
+baseurl: "/kgraphql/"
+url: "https://apurebase.gitlab.io"
+
+# Build settings
+markdown: kramdown
+theme: "just-the-docs"
+
+permalink: pretty
+
+
+# Just the Docs
+search_enabled: true
+color_scheme: test
+sass:
+  load_paths:
+    - _sass
+aux_links:
+  "KGraphQL on GitHub":
+    - "//github.com/apurebase/kgraphql"
+
+exclude:
+  - Gemfile
+  - Gemfile.lock
+  - node_modules
+  - vendor/bundle/
+  - vendor/cache/
+  - vendor/gems/
+  - vendor/ruby/
+  - any_additional_item # any user-specific listing goes at the end
diff --git a/docs/assets/js/search-data.json b/docs/assets/js/search-data.json
new file mode 100644
index 00000000..1b51d90f
--- /dev/null
+++ b/docs/assets/js/search-data.json
@@ -0,0 +1,12 @@
+---
+---
+{
+{% for page in site.html_pages %}{% if page.search_exclude != true %}"{{ forloop.index0 }}": {
+"id": "{{ forloop.index0 }}",
+"title": "{{ page.title | replace: '&amp;', '&' }}",
+"content": "{{ page.content | markdownify | strip_html | escape_once | remove: 'Table of contents' | remove: '```'  | remove: '---' | replace: '\', ' ' | normalize_whitespace }}",
+"url": "{{ page.url | absolute_url }}",
+"relUrl": "{{ page.url }}"
+}{% unless forloop.last %},{% endunless %}
+{% endif %}{% endfor %}
+}
diff --git a/docs/creating-schema.md b/docs/creating-schema.md
new file mode 100644
index 00000000..0eb131b0
--- /dev/null
+++ b/docs/creating-schema.md
@@ -0,0 +1,13 @@
+---
+layout: default
+title: Creating Schema
+nav_order: 2
+has_children: true
+---
+
+
+`SchemaBuilder` exposes ability to create schema and configure it. Its methods accept closures to configure contained DSL items.
+
+Schema creation is performed by invoking `KGraphQL.schema { ... }`
+
+Every DSL receiver exposes `description: String?` property. Description is visible in introspection system. This property is omitted in documentation for each schema element.
\ No newline at end of file
diff --git a/docs/creating-schema/configuration.md b/docs/creating-schema/configuration.md
new file mode 100644
index 00000000..8ee1a627
--- /dev/null
+++ b/docs/creating-schema/configuration.md
@@ -0,0 +1,30 @@
+---
+layout: default
+title: Configuration
+parent: Creating Schema
+nav_order: 4
+---
+
+KGraphQL schema allows configuration of following properties:
+
+| Property | Description | Default value |
+|----------|-------------|---------------|
+| useDefaultPrettyPrinter |	Schema pretty prints JSON reponses | `false` |
+| useCachingDocumentParser | Schema caches parsed query documents | `true` |
+| documentParserCacheMaximumSize | Schema document cache maximum size | `1000` |
+| objectMapper | Schema is using Jackson ObjectMapper from this property | result of `jacksonObjectMapper()` from [jackson-kotlin-module](https://github.com/FasterXML/jackson-module-kotlin) |
+|acceptSingleValueAsArray | Schema accepts single argument values as singleton list | `true`
+| coroutineDispatcher | Schema is using CoroutineDispatcher from this property | [CommonPool](https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/CommonPool.kt) |
+
+
+*Example*
+
+```kotlin
+KGraphQL.schema {
+    configure {
+        useDefaultPrettyPrinter = true
+        objectMapper = jacksonObjectMapper()
+        useCachingDocumentParser = false
+    }
+}
+```
\ No newline at end of file
diff --git a/docs/creating-schema/deprecation.md b/docs/creating-schema/deprecation.md
new file mode 100644
index 00000000..92b1ea97
--- /dev/null
+++ b/docs/creating-schema/deprecation.md
@@ -0,0 +1,8 @@
+---
+layout: default
+title: Deprecation
+parent: Creating Schema
+nav_order: 3
+---
+
+Schema creator is able to deprecate fields, operations and enum values. DSL builders for those schema elements expose method `deprecate(reason: String)`. Deprecation is visible in schema introspection system with fields `isDeprecated : Boolean` and `deprecationReason: String`.
\ No newline at end of file
diff --git a/docs/creating-schema/operations.md b/docs/creating-schema/operations.md
new file mode 100644
index 00000000..9d6a5a6d
--- /dev/null
+++ b/docs/creating-schema/operations.md
@@ -0,0 +1,59 @@
+---
+layout: default
+title: Operations
+parent: Creating Schema
+nav_order: 1
+---
+
+There are three types of operations that GraphQL models:
+
+* query – a read‐only fetch.
+* mutation – a write followed by a fetch.
+* subscription – a long‐lived request that fetches data in response to source events. 
+
+Each operation is represented by an operation name and a selection set.
+
+In KGraphQL, operation is declared in `SchemaBuilder` block. Every operation has 2 properties:
+
+| name | description |
+|------|-------------|
+| name | name of operation |
+| resolver | [Resolver]({{site.baseurl}}creating-schema/resolver) |
+
+Selection set is automatically created based on resolver return type. By default, selection set for specific class contains all its member properties (without extension properties), but it can be customized (TBD Type wiki page). Operations can be [deprecated]({{site.baseurl}}creating-schema/deprecation)
+
+Subscription is not supported yet.
+
+## query { }
+
+`query` allows to create resolver for query operation.
+
+*Example*
+
+```kotlin
+data class Hero(val name : String, val age : Int)
+
+query("hero"){
+    description = "returns formatted name of R2-D2"
+    resolver { -> Hero("R2-D2", 40) } 
+}
+```
+
+This example adds query with name hero, which returns new instance of R2-D2 Hero. It can be queried with selection set for name or age, example query: `{hero{name, age}}`
+
+## mutation { }
+`mutation` allows to create resolver for mutation operation.
+
+*Example*
+
+```kotlin
+mutation("createHero"){
+    description = "Creates hero with specified name"
+    resolver { name : String -> name } 
+}
+```
+
+This example adds mutation with name `createHero`, which returns passed name.
+
+## subscription { }
+`subscription` operations are not supported yet.
\ No newline at end of file
diff --git a/docs/creating-schema/resolver.md b/docs/creating-schema/resolver.md
new file mode 100644
index 00000000..941ac20d
--- /dev/null
+++ b/docs/creating-schema/resolver.md
@@ -0,0 +1,28 @@
+---
+layout: default
+title: Resolver
+parent: Creating Schema
+nav_order: 5
+---
+
+Resolver is KGraphQL definition of piece of system logic, required to resolve response graph. Operations, Extension Properties and Union Properties accept resolver, which allows schema creator to configure schema behaviour.
+
+Resolver clause accepts kotlin function and returns its DSL item, which is entry point for additional customization of resolver
+
+## withArgs {}
+`withArgs` closure exposes single method `arg`
+
+### arg { }
+`arg` exposes possibility to customize argument default value. Default value is automatically used if query doesn't provide any. it is matched by argument name.
+
+*Example*
+
+```kotlin
+KGraphQL.schema {
+    query("data"){
+        resolver { int: Int, string: String? -> int }.withArgs {
+            arg <Int> { name = "int"; defaultValue = 33 }
+        }
+    }
+}
+```
\ No newline at end of file
diff --git a/docs/creating-schema/type-system.md b/docs/creating-schema/type-system.md
new file mode 100644
index 00000000..45439b7d
--- /dev/null
+++ b/docs/creating-schema/type-system.md
@@ -0,0 +1,34 @@
+---
+layout: default
+title: Type System
+parent: Creating Schema
+has_children: true
+nav_order: 2
+---
+
+Type System is a fundament of GraphQL schema. It is based on Kotlin type system and type definitions provided via DSL.
+
+## Type System creation
+KGraphQL is able to inspect operations and partially infer schema type system, so schema creator does not have to explicitly declare every type (but it may if needed). Unions, Enums and Scalars require explicit definition in Schema DSL. Inferred classes are interpreted as GraphQL Object or Interface type.
+
+
+## Object or Interface?
+KGraphQL maps found types (implicit and explicit) to GraphQL simple inheritance model, where every type with fields is either Object or Interface. Rules are following:
+
+* if Class in schema is superclass of another Class in schema, it is interpreted as GraphQL Interface type.
+* if Class in schema is NOT superclass of any another Class in schema, it is interpreted as GraphQL Object type.
+* if Interface in schema is implemented by any Class in schema, it is interpreted as GraphQL Interface type.
+* if Interface in schema is NOT implemented by any Class in schema, it is interpreted as GraphQL Object type.
+
+## Built in types
+By default, every schema has following built in types:
+
+### Scalars
+* **String** - represents textual data, represented as UTF‐8 character sequences
+* **Int** - represents a signed 32‐bit numeric non‐fractional value
+* **Long** - represents a signed 64‐bit numeric non‐fractional value. Long type is not part of GraphQL specification, but it is built in primitive type in Kotlin language.
+* **Float** - represents signed double‐precision fractional values as specified by IEEE 754. KGraphQL represents Kotlin primitive Double and Float values as GraphQL Float.
+* **Boolean** - represents true or false
+
+## Introspection types
+Introspection interface aligns to [GraphQL specification](http://facebook.github.io/graphql/#sec-Schema-Introspection).
diff --git a/docs/creating-schema/type-system/enums.md b/docs/creating-schema/type-system/enums.md
new file mode 100644
index 00000000..4b3b7e6b
--- /dev/null
+++ b/docs/creating-schema/type-system/enums.md
@@ -0,0 +1,32 @@
+---
+layout: default
+title: Enums
+grand_parent: Creating Schema
+parent: Type System
+nav_order: 2
+---
+
+GraphQL Enums are a variant on the Scalar type, which represents one of a finite set of possible values. They directly map to Kotlin enums
+
+*Example*
+
+```kotlin
+enum class Coolness {
+    NOT_COOL, COOL, TOTALLY_COOL
+}
+
+val schema = KGraphQL.schema {
+    enum<Coolness>{
+        description = "State of coolness"
+        value(Coolness.COOL){
+            description = "really cool"
+        }
+    }
+    
+    query("cool"){
+        resolver{ cool: Coolness -> cool.toString() }
+    }
+}
+```
+
+Enum values can be [deprecated]({{site.baseurl}}creating-schema/deprecation).
\ No newline at end of file
diff --git a/docs/creating-schema/type-system/input-objects.md b/docs/creating-schema/type-system/input-objects.md
new file mode 100644
index 00000000..6eca6cfd
--- /dev/null
+++ b/docs/creating-schema/type-system/input-objects.md
@@ -0,0 +1,13 @@
+---
+layout: default
+title: Input Objects
+grand_parent: Creating Schema
+parent: Type System
+nav_order: 4
+---
+
+An GraphQL Input Object defines a set of input fields; the input fields are either scalars, enums, or other input objects. Like Object and Interface types, Input Object types are inferred from defined operations, but can be explicitly declared as well.
+
+## inputType {}
+
+`inputType` method can be used only to set description property and explicitly define type.
\ No newline at end of file
diff --git a/docs/creating-schema/type-system/objects-and-Interfaces.md b/docs/creating-schema/type-system/objects-and-Interfaces.md
new file mode 100644
index 00000000..4e1aceb1
--- /dev/null
+++ b/docs/creating-schema/type-system/objects-and-Interfaces.md
@@ -0,0 +1,59 @@
+---
+layout: default
+title: Objects and Interfaces
+grand_parent: Creating Schema
+parent: Type System
+has_children: true
+nav_order: 5
+---
+
+GraphQL Objects and Interfaces represent a list of named fields, each of which yield a value of a specific type. KGraphQL inspects defined operations to create type system, but schema creator is able to explicitly declare and customize types. Besides, only member properties are inspected.
+
+## type { }
+`type` method is entry point to Type DSL. See [Extension Properties]({{site.baseurl}}creating-schema/type-system/objects-and-interfaces/extension-properties), [Kotlin Properties]({{site.baseurl}}creating-schema/type-system/objects-and-interfaces/kotlin-properties), [Union Properties]({{site.baseurl}}creating-schema/type-system/objects-and-interfaces/union-properties).
+
+*Example*
+```kotlin
+data class Person(val name: String, val age: Int)
+
+KGraphQL.schema {
+    type<Person>{
+        description = "Human"
+    }
+}
+```
+
+## KProperty1<T, R>.ignore
+extension function `ignore()` makes KGraphQL ignore its receiver property.
+
+*Example*
+
+```kotlin
+data class Person(val name: String, val age: Int)
+
+KGraphQL.schema {
+    type<Person>{
+        Person::age.ignore()
+    }
+}
+```
+
+## transformation(KProperty1<T, R>) {}
+
+`transformation` method allows schema creator to attach data transformation on any kotlin property of type. Like operations, `transformation` has property `resolver` which is used to declare data transformation.
+
+*Example*
+
+```kotlin
+data class Person(val name: String, val age: Int)
+
+KGraphQL.schema {
+    type<Person>{
+        transformation(Person::age) {
+            //inMonths is nullable, so client can fetch age property without passing any value to this argument
+            //if(null == true) evaluates to false, if(null) is invalid kotlin code
+            age: Int , inMonths : Boolean? -> if(inMonths == true) age * 12 else age
+        }
+    }
+}
+```
diff --git a/docs/creating-schema/type-system/objects-and-interfaces/extension-properties.md b/docs/creating-schema/type-system/objects-and-interfaces/extension-properties.md
new file mode 100644
index 00000000..738b4fc3
--- /dev/null
+++ b/docs/creating-schema/type-system/objects-and-interfaces/extension-properties.md
@@ -0,0 +1,26 @@
+---
+layout: default
+title: Extension Properties
+grand_parent: Type System
+parent: Objects and Interfaces
+nav_order: 2
+---
+
+Extension properties allow schema creator to easily attach additional field to any type. It is separately evaluated after main entity is resolved.
+
+## property { }
+`property` method accepts [resolver]({{site.baseurl}}creating-schema/resolver) and can be subject of [deprecation]({{site.baseurl}}creating-schema/deprecation).
+
+*Example*
+
+```kotlin
+data class Person(val name: String, val age: Int)
+
+KGraphQL.schema {
+    type<Person>{
+        property<Boolean>("isChild"){
+            resolver { person -> (person.age <= 18) }
+        }
+    }
+}
+```
diff --git a/docs/creating-schema/type-system/objects-and-interfaces/kotlin-properties.md b/docs/creating-schema/type-system/objects-and-interfaces/kotlin-properties.md
new file mode 100644
index 00000000..91131817
--- /dev/null
+++ b/docs/creating-schema/type-system/objects-and-interfaces/kotlin-properties.md
@@ -0,0 +1,26 @@
+---
+layout: default
+title: Kotlin Properties
+grand_parent: Type System
+parent: Objects and Interfaces
+nav_order: 1
+---
+
+Kotlin properties are automatically inspected during schema creation. Schema DSL allows ignoring and [deprecation]({{site.baseurl}}creating-schema/deprecation) of kotlin properties
+
+*Example*
+
+```kotlin
+data class Person(val name: String, val age: Int)
+
+KGraphQL.schema {
+    type<Person>{
+        property(Person::age){
+            ignore = true
+        }
+        property(Person::name){
+            deprecate("Person need no name")
+        }
+    }
+}
+```
diff --git a/docs/creating-schema/type-system/objects-and-interfaces/union-properties.md b/docs/creating-schema/type-system/objects-and-interfaces/union-properties.md
new file mode 100644
index 00000000..edfaa5be
--- /dev/null
+++ b/docs/creating-schema/type-system/objects-and-interfaces/union-properties.md
@@ -0,0 +1,33 @@
+---
+layout: default
+title: Union Properties
+grand_parent: Type System
+parent: Objects and Interfaces
+nav_order: 3
+---
+
+As Kotlin does not support unions, union properties have to be explicitly declared in Schema DSL. Creating union property requires defining [resolver]({{site.baseurl}}creating-schema/resolver) and return type. Return Type is reference returned by creation of [union type]({{site.baseurl}}creating-schema/type-system/unions).
+
+Union type resolver is not type checked. Invalid resolver implementation which would return value of type other than members of union type will fail in runtime.
+
+*Example*
+
+```kotlin
+data class UnionMember1(val one : String)
+
+data class UnionMember2(val two : String)
+
+data class Person(val name: String, val age: Int)
+
+KGraphQL.schema {
+    type<Person>{
+        unionProperty("union"){
+            returnType = unionType("UnionExample"){
+                 type<UnionMember1>()
+                 type<UnionMember2>()
+            }
+            resolver { person -> if (person.age <= 18) UnionMember1("one") else UnionMember2("two") }
+        }
+    }
+}
+```
diff --git a/docs/creating-schema/type-system/scalars.md b/docs/creating-schema/type-system/scalars.md
new file mode 100644
index 00000000..86956b43
--- /dev/null
+++ b/docs/creating-schema/type-system/scalars.md
@@ -0,0 +1,32 @@
+---
+layout: default
+title: Scalars
+grand_parent: Creating Schema
+parent: Type System
+nav_order: 1
+---
+
+As defined by specification, scalar represents a primitive value in GraphQL. In KGraphQL, besides built-in scalar types, client code can declare custom scalar type, which can coerce to String, Boolean, Int, Long or Float (Kotlin Double).
+
+KGraphQL provides group of DSL methods: `stringScalar { }`, `booleanScalar { }`, `intScalar{ }`, `longScalar{ }`, `floatScalar{ }`. They differ only by Kotlin primitive type they coerce to.
+
+Scalar has to define its coercion functions `deserialize` and `serialize` or coercion object which implements correct subtype of `com.apurebase.kgraphql.schema.scalar.ScalarCoercion`.
+
+*Example of direct coercion functions declaration*
+```kotlin
+stringScalar<UUID> {
+  deserialize = { uuid : String -> UUID.fromString(uuid) }
+  serialize = UUID::toString
+}
+```
+
+
+*Example of coercion object declaration*
+```kotlin
+stringScalar<UUID> {
+  coercion = object : StringScalarCoercion<UUID> {
+    override fun serialize(instance: UUID): String = instance.toString()
+    override fun deserialize(raw: String): UUID = UUID.fromString(raw)
+  }
+}
+```
\ No newline at end of file
diff --git a/docs/creating-schema/type-system/unions.md b/docs/creating-schema/type-system/unions.md
new file mode 100644
index 00000000..3e87d30a
--- /dev/null
+++ b/docs/creating-schema/type-system/unions.md
@@ -0,0 +1,28 @@
+---
+layout: default
+title: Unions
+grand_parent: Creating Schema
+parent: Type System
+nav_order: 3
+---
+
+GraphQL Unions represent an object that could be one of a list of GraphQL Object types, but provides for no guaranteed fields between those types.
+
+## unionType { }
+
+union allows to define possible types of union. Union members have to be object types (Object or Interface). It returns reference to created union type, which is required to define properties with union return type.
+
+*Example*
+
+```kotlin
+data class UnionMember1(val one : String)
+
+data class UnionMember2(val two : String)
+
+KgraphQL.schema {
+    val unionExample = unionType("UnionExample"){
+        type<UnionMember1>()
+        type<UnionMember2>()
+    }
+}
+```
diff --git a/docs/index.md b/docs/index.md
new file mode 100644
index 00000000..4cd2f876
--- /dev/null
+++ b/docs/index.md
@@ -0,0 +1,10 @@
+---
+layout: home
+title: KGraphQL
+nav_order: 1
+---
+
+
+Welcome to the KGraphQL docs!
+
+General information is available in project's [README](https://github.com/aPureBase/KGraphQL#kgraphql). Before reading this documentation it is recommended to familiarize with [GraphQL docs](https://graphql.org/learn/)
\ No newline at end of file
diff --git a/src/jmh/kotlin/com/apurebase/kgraphql/BenchmarkSchema.kt b/src/jmh/kotlin/com/apurebase/kgraphql/BenchmarkSchema.kt
new file mode 100644
index 00000000..4dc4293d
--- /dev/null
+++ b/src/jmh/kotlin/com/apurebase/kgraphql/BenchmarkSchema.kt
@@ -0,0 +1,50 @@
+package com.apurebase.kgraphql
+
+import com.apurebase.kgraphql.schema.Schema
+import com.apurebase.kgraphql.schema.dsl.SchemaBuilder
+
+
+data class ModelOne(val name : String, val quantity : Int = 1, val active : Boolean = true)
+
+data class ModelTwo(val one : ModelOne, val range: IntRange)
+
+data class ModelThree(val id : String, val twos : List<ModelTwo>)
+
+object BenchmarkSchema {
+    val ones = listOf(
+        ModelOne("DUDE"),
+        ModelOne("GUY"),
+        ModelOne("PAL"),
+        ModelOne("FELLA")
+    )
+
+    val oneResolver : ()->List<ModelOne> = { ones }
+
+    val twoResolver : (name : String)-> ModelTwo? = { name ->
+        ones.find { it.name == name }?.let {
+            ModelTwo(
+                it,
+                it.quantity..12
+            )
+        }
+    }
+
+    val threeResolver : ()-> ModelThree = {
+        ModelThree(
+            "",
+            ones.map { ModelTwo(it, it.quantity..10) })
+    }
+
+    fun create(block : SchemaBuilder<Unit>.()-> Unit): Schema = KGraphQL.schema {
+        block()
+        query("one") {
+            resolver(oneResolver)
+        }
+        query("two") {
+            resolver(twoResolver)
+        }
+        query("three") {
+            resolver(threeResolver)
+        }
+    }
+}
diff --git a/src/jmh/kotlin/com/github/pgutkowski/kgraphql/FunctionExecutionBenchmark.kt b/src/jmh/kotlin/com/apurebase/kgraphql/FunctionExecutionBenchmark.kt
similarity index 94%
rename from src/jmh/kotlin/com/github/pgutkowski/kgraphql/FunctionExecutionBenchmark.kt
rename to src/jmh/kotlin/com/apurebase/kgraphql/FunctionExecutionBenchmark.kt
index 522e77f9..05bc80fe 100644
--- a/src/jmh/kotlin/com/github/pgutkowski/kgraphql/FunctionExecutionBenchmark.kt
+++ b/src/jmh/kotlin/com/apurebase/kgraphql/FunctionExecutionBenchmark.kt
@@ -1,6 +1,6 @@
-package com.github.pgutkowski.kgraphql
+package com.apurebase.kgraphql
 
-import com.github.pgutkowski.kgraphql.schema.model.FunctionWrapper
+import com.apurebase.kgraphql.schema.model.FunctionWrapper
 import org.junit.Test
 import org.openjdk.jmh.annotations.Benchmark
 import org.openjdk.jmh.annotations.Fork
diff --git a/src/jmh/kotlin/com/github/pgutkowski/kgraphql/JVisualVMSampler.kt b/src/jmh/kotlin/com/apurebase/kgraphql/JVisualVMSampler.kt
similarity index 89%
rename from src/jmh/kotlin/com/github/pgutkowski/kgraphql/JVisualVMSampler.kt
rename to src/jmh/kotlin/com/apurebase/kgraphql/JVisualVMSampler.kt
index a574f57e..4583489c 100644
--- a/src/jmh/kotlin/com/github/pgutkowski/kgraphql/JVisualVMSampler.kt
+++ b/src/jmh/kotlin/com/apurebase/kgraphql/JVisualVMSampler.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql
+package com.apurebase.kgraphql
 
 
 val schema = BenchmarkSchema.create {  }
diff --git a/src/jmh/kotlin/com/github/pgutkowski/kgraphql/ParallelExecutionBenchmark.kt b/src/jmh/kotlin/com/apurebase/kgraphql/ParallelExecutionBenchmark.kt
similarity index 94%
rename from src/jmh/kotlin/com/github/pgutkowski/kgraphql/ParallelExecutionBenchmark.kt
rename to src/jmh/kotlin/com/apurebase/kgraphql/ParallelExecutionBenchmark.kt
index caad55fe..d900334b 100644
--- a/src/jmh/kotlin/com/github/pgutkowski/kgraphql/ParallelExecutionBenchmark.kt
+++ b/src/jmh/kotlin/com/apurebase/kgraphql/ParallelExecutionBenchmark.kt
@@ -1,6 +1,6 @@
-package com.github.pgutkowski.kgraphql
+package com.apurebase.kgraphql
 
-import com.github.pgutkowski.kgraphql.schema.Schema
+import com.apurebase.kgraphql.schema.Schema
 import org.junit.Test
 import org.openjdk.jmh.annotations.*
 import java.util.concurrent.ThreadLocalRandom
diff --git a/src/jmh/kotlin/com/github/pgutkowski/kgraphql/RequestCachingBenchmark.kt b/src/jmh/kotlin/com/apurebase/kgraphql/RequestCachingBenchmark.kt
similarity index 91%
rename from src/jmh/kotlin/com/github/pgutkowski/kgraphql/RequestCachingBenchmark.kt
rename to src/jmh/kotlin/com/apurebase/kgraphql/RequestCachingBenchmark.kt
index 4f84e7de..7e673180 100644
--- a/src/jmh/kotlin/com/github/pgutkowski/kgraphql/RequestCachingBenchmark.kt
+++ b/src/jmh/kotlin/com/apurebase/kgraphql/RequestCachingBenchmark.kt
@@ -1,6 +1,6 @@
-package com.github.pgutkowski.kgraphql
+package com.apurebase.kgraphql
 
-import com.github.pgutkowski.kgraphql.schema.Schema
+import com.apurebase.kgraphql.schema.Schema
 import org.openjdk.jmh.annotations.Benchmark
 import org.openjdk.jmh.annotations.Fork
 import org.openjdk.jmh.annotations.Measurement
diff --git a/src/jmh/kotlin/com/github/pgutkowski/kgraphql/SimpleExecutionOverheadBenchmark.kt b/src/jmh/kotlin/com/apurebase/kgraphql/SimpleExecutionOverheadBenchmark.kt
similarity index 85%
rename from src/jmh/kotlin/com/github/pgutkowski/kgraphql/SimpleExecutionOverheadBenchmark.kt
rename to src/jmh/kotlin/com/apurebase/kgraphql/SimpleExecutionOverheadBenchmark.kt
index 0dff83aa..2ab4127e 100644
--- a/src/jmh/kotlin/com/github/pgutkowski/kgraphql/SimpleExecutionOverheadBenchmark.kt
+++ b/src/jmh/kotlin/com/apurebase/kgraphql/SimpleExecutionOverheadBenchmark.kt
@@ -1,11 +1,11 @@
-package com.github.pgutkowski.kgraphql
+package com.apurebase.kgraphql
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import com.github.pgutkowski.kgraphql.BenchmarkSchema.oneResolver
-import com.github.pgutkowski.kgraphql.BenchmarkSchema.threeResolver
-import com.github.pgutkowski.kgraphql.BenchmarkSchema.twoResolver
-import com.github.pgutkowski.kgraphql.schema.Schema
+import com.apurebase.kgraphql.BenchmarkSchema.oneResolver
+import com.apurebase.kgraphql.BenchmarkSchema.threeResolver
+import com.apurebase.kgraphql.BenchmarkSchema.twoResolver
+import com.apurebase.kgraphql.schema.Schema
 import org.junit.Test
 import org.openjdk.jmh.annotations.Benchmark
 import org.openjdk.jmh.annotations.Fork
diff --git a/src/jmh/kotlin/com/github/pgutkowski/kgraphql/BenchmarkSchema.kt b/src/jmh/kotlin/com/github/pgutkowski/kgraphql/BenchmarkSchema.kt
deleted file mode 100644
index 8f3ed4bf..00000000
--- a/src/jmh/kotlin/com/github/pgutkowski/kgraphql/BenchmarkSchema.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.github.pgutkowski.kgraphql
-
-import com.github.pgutkowski.kgraphql.schema.Schema
-import com.github.pgutkowski.kgraphql.schema.dsl.SchemaBuilder
-
-
-data class ModelOne(val name : String, val quantity : Int = 1, val active : Boolean = true)
-
-data class ModelTwo(val one : ModelOne, val range: IntRange)
-
-data class ModelThree(val id : String, val twos : List<ModelTwo>)
-
-object BenchmarkSchema {
-    val ones = listOf(ModelOne("DUDE"),ModelOne("GUY"),ModelOne("PAL"),ModelOne("FELLA"))
-
-    val oneResolver : ()->List<ModelOne> = { ones }
-
-    val twoResolver : (name : String)-> ModelTwo? = { name ->
-        ones.find { it.name == name }?.let { ModelTwo(it, it.quantity..12) }
-    }
-
-    val threeResolver : ()-> ModelThree = { ModelThree("", ones.map { ModelTwo(it, it.quantity..10) }) }
-
-    fun create(block : SchemaBuilder<Unit>.()-> Unit): Schema = KGraphQL.schema {
-        block()
-        query("one"){
-            resolver(oneResolver)
-        }
-        query("two"){
-            resolver(twoResolver)
-        }
-        query("three"){
-            resolver(threeResolver)
-        }
-    }
-}
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/Context.kt b/src/main/kotlin/com/apurebase/kgraphql/Context.kt
similarity index 73%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/Context.kt
rename to src/main/kotlin/com/apurebase/kgraphql/Context.kt
index ec978bde..9b9de26e 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/Context.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/Context.kt
@@ -1,6 +1,6 @@
-package com.github.pgutkowski.kgraphql
+package com.apurebase.kgraphql
 
-import com.github.pgutkowski.kgraphql.schema.introspection.NotIntrospected
+import com.apurebase.kgraphql.schema.introspection.NotIntrospected
 import kotlin.reflect.KClass
 
 @NotIntrospected
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/ContextBuilder.kt b/src/main/kotlin/com/apurebase/kgraphql/ContextBuilder.kt
similarity index 95%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/ContextBuilder.kt
rename to src/main/kotlin/com/apurebase/kgraphql/ContextBuilder.kt
index 59ca65b1..10500e45 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/ContextBuilder.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/ContextBuilder.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql
+package com.apurebase.kgraphql
 
 import kotlin.reflect.KClass
 
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/ExecutionException.kt b/src/main/kotlin/com/apurebase/kgraphql/ExecutionException.kt
similarity index 71%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/ExecutionException.kt
rename to src/main/kotlin/com/apurebase/kgraphql/ExecutionException.kt
index 02a18848..fac4aec8 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/ExecutionException.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/ExecutionException.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql
+package com.apurebase.kgraphql
 
 
 class ExecutionException(message: String, cause: Throwable? = null) : Exception(message, cause)
\ No newline at end of file
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/Extensions.kt b/src/main/kotlin/com/apurebase/kgraphql/Extensions.kt
similarity index 96%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/Extensions.kt
rename to src/main/kotlin/com/apurebase/kgraphql/Extensions.kt
index b94cc474..f4f5d343 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/Extensions.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/Extensions.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql
+package com.apurebase.kgraphql
 
 import kotlin.reflect.KClass
 import kotlin.reflect.KParameter
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/KGraphQL.kt b/src/main/kotlin/com/apurebase/kgraphql/KGraphQL.kt
similarity index 57%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/KGraphQL.kt
rename to src/main/kotlin/com/apurebase/kgraphql/KGraphQL.kt
index 9b93b7b6..c1720ac3 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/KGraphQL.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/KGraphQL.kt
@@ -1,6 +1,6 @@
-package com.github.pgutkowski.kgraphql
+package com.apurebase.kgraphql
 
-import com.github.pgutkowski.kgraphql.schema.dsl.SchemaBuilder
+import com.apurebase.kgraphql.schema.dsl.SchemaBuilder
 
 
 class KGraphQL {
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/RequestException.kt b/src/main/kotlin/com/apurebase/kgraphql/RequestException.kt
similarity index 71%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/RequestException.kt
rename to src/main/kotlin/com/apurebase/kgraphql/RequestException.kt
index b6f9b7e4..465b3ee8 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/RequestException.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/RequestException.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql
+package com.apurebase.kgraphql
 
 
 open class RequestException(message: String, cause: Throwable? = null) : Exception(message, cause)
\ No newline at end of file
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/ValidationException.kt b/src/main/kotlin/com/apurebase/kgraphql/ValidationException.kt
similarity index 72%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/ValidationException.kt
rename to src/main/kotlin/com/apurebase/kgraphql/ValidationException.kt
index 16807479..c4938f79 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/ValidationException.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/ValidationException.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql
+package com.apurebase.kgraphql
 
 
 class ValidationException(message: String, cause: Throwable? = null) : RequestException(message, cause)
\ No newline at end of file
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/configuration/SchemaConfiguration.kt b/src/main/kotlin/com/apurebase/kgraphql/configuration/SchemaConfiguration.kt
similarity index 89%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/configuration/SchemaConfiguration.kt
rename to src/main/kotlin/com/apurebase/kgraphql/configuration/SchemaConfiguration.kt
index 44058473..d9fec594 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/configuration/SchemaConfiguration.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/configuration/SchemaConfiguration.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql.configuration
+package com.apurebase.kgraphql.configuration
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import kotlinx.coroutines.CoroutineDispatcher
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/request/Arguments.kt b/src/main/kotlin/com/apurebase/kgraphql/request/Arguments.kt
similarity index 87%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/request/Arguments.kt
rename to src/main/kotlin/com/apurebase/kgraphql/request/Arguments.kt
index a6104e96..1bb4feec 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/request/Arguments.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/request/Arguments.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql.request
+package com.apurebase.kgraphql.request
 
 /**
  * Represents raw values of arguments in query document, so (id: 343, name: "Pablo", book: $book) is
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/request/CachingDocumentParser.kt b/src/main/kotlin/com/apurebase/kgraphql/request/CachingDocumentParser.kt
similarity index 95%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/request/CachingDocumentParser.kt
rename to src/main/kotlin/com/apurebase/kgraphql/request/CachingDocumentParser.kt
index f209c47b..ee02c971 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/request/CachingDocumentParser.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/request/CachingDocumentParser.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql.request
+package com.apurebase.kgraphql.request
 
 import com.github.benmanes.caffeine.cache.Caffeine
 
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/request/Document.kt b/src/main/kotlin/com/apurebase/kgraphql/request/Document.kt
similarity index 90%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/request/Document.kt
rename to src/main/kotlin/com/apurebase/kgraphql/request/Document.kt
index feca1b8b..3f70d0e6 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/request/Document.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/request/Document.kt
@@ -1,7 +1,7 @@
-package com.github.pgutkowski.kgraphql.request
+package com.apurebase.kgraphql.request
 
-import com.github.pgutkowski.kgraphql.RequestException
-import com.github.pgutkowski.kgraphql.request.graph.Fragment
+import com.apurebase.kgraphql.RequestException
+import com.apurebase.kgraphql.request.graph.Fragment
 import java.util.*
 
 
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/request/DocumentParser.kt b/src/main/kotlin/com/apurebase/kgraphql/request/DocumentParser.kt
similarity index 95%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/request/DocumentParser.kt
rename to src/main/kotlin/com/apurebase/kgraphql/request/DocumentParser.kt
index 194e869b..153af209 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/request/DocumentParser.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/request/DocumentParser.kt
@@ -1,11 +1,11 @@
-package com.github.pgutkowski.kgraphql.request
-
-import com.github.pgutkowski.kgraphql.RequestException
-import com.github.pgutkowski.kgraphql.request.graph.DirectiveInvocation
-import com.github.pgutkowski.kgraphql.request.graph.Fragment
-import com.github.pgutkowski.kgraphql.request.graph.SelectionNode
-import com.github.pgutkowski.kgraphql.request.graph.SelectionSetBuilder
-import com.github.pgutkowski.kgraphql.request.graph.SelectionTree
+package com.apurebase.kgraphql.request
+
+import com.apurebase.kgraphql.RequestException
+import com.apurebase.kgraphql.request.graph.DirectiveInvocation
+import com.apurebase.kgraphql.request.graph.Fragment
+import com.apurebase.kgraphql.request.graph.SelectionNode
+import com.apurebase.kgraphql.request.graph.SelectionSetBuilder
+import com.apurebase.kgraphql.request.graph.SelectionTree
 
 /**
  * Utility for parsing query document and its structures.
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/request/Operation.kt b/src/main/kotlin/com/apurebase/kgraphql/request/Operation.kt
similarity index 80%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/request/Operation.kt
rename to src/main/kotlin/com/apurebase/kgraphql/request/Operation.kt
index e5393058..836b3e50 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/request/Operation.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/request/Operation.kt
@@ -1,6 +1,6 @@
-package com.github.pgutkowski.kgraphql.request
+package com.apurebase.kgraphql.request
 
-import com.github.pgutkowski.kgraphql.request.graph.SelectionTree
+import com.apurebase.kgraphql.request.graph.SelectionTree
 
 
 data class Operation(val selectionTree: SelectionTree, val variables: List<OperationVariable>?, val name : String?, val action : Action?) {
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/request/OperationVariable.kt b/src/main/kotlin/com/apurebase/kgraphql/request/OperationVariable.kt
similarity index 83%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/request/OperationVariable.kt
rename to src/main/kotlin/com/apurebase/kgraphql/request/OperationVariable.kt
index 333ccf82..dd8f6c91 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/request/OperationVariable.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/request/OperationVariable.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql.request
+package com.apurebase.kgraphql.request
 
 /**
  * Represents variable in scope of operation, in 'query ($var: Int = 33)',
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/request/ParsingContext.kt b/src/main/kotlin/com/apurebase/kgraphql/request/ParsingContext.kt
similarity index 93%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/request/ParsingContext.kt
rename to src/main/kotlin/com/apurebase/kgraphql/request/ParsingContext.kt
index 8bed8b37..183be3c5 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/request/ParsingContext.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/request/ParsingContext.kt
@@ -1,6 +1,6 @@
-package com.github.pgutkowski.kgraphql.request
+package com.apurebase.kgraphql.request
 
-import com.github.pgutkowski.kgraphql.RequestException
+import com.apurebase.kgraphql.RequestException
 
 data class ParsingContext(
         val fullString : String,
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/request/RequestPreProcessing.kt b/src/main/kotlin/com/apurebase/kgraphql/request/RequestPreProcessing.kt
similarity index 81%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/request/RequestPreProcessing.kt
rename to src/main/kotlin/com/apurebase/kgraphql/request/RequestPreProcessing.kt
index 6cf135c2..85c26675 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/request/RequestPreProcessing.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/request/RequestPreProcessing.kt
@@ -1,24 +1,29 @@
-package com.github.pgutkowski.kgraphql.request
+package com.apurebase.kgraphql.request
 
-import com.github.pgutkowski.kgraphql.RequestException
-import com.github.pgutkowski.kgraphql.not
+import com.apurebase.kgraphql.RequestException
+import com.apurebase.kgraphql.not
 
-val OPERANDS = "{}():[]"
+internal const val OPERANDS = "{}():[]"
 
-val IGNORED_CHARACTERS = "\n\t, "
+private const val IGNORED_CHARACTERS = "\n\t\r, "
 
-val DELIMITERS = OPERANDS + IGNORED_CHARACTERS
+private const val DELIMITERS = OPERANDS + IGNORED_CHARACTERS
 
-fun tokenizeRequest(input : String) : List<String> {
+internal fun tokenizeRequest(input : String) : List<String> {
     var i = 0
     val tokens : MutableList<String> = mutableListOf()
 
-    while(i < input.length){
-        when(input[i]){
-            in IGNORED_CHARACTERS -> { i++ }
+    while (i < input.length) {
+        when (input[i]) {
+            in IGNORED_CHARACTERS -> i++
             in OPERANDS -> {
-                tokens.add(input[i].toString())
-                i++
+                if (input.length > i + 1 && input.substring(i, i + 2) == "]!") {
+                    tokens.add("]!")
+                    i += 2
+                } else {
+                    tokens.add(input[i].toString())
+                    i++
+                }
             }
             '\"' -> {
                 val substring = input.substring(i + 1)
@@ -65,7 +70,7 @@ private fun extractValueToken(substring: String): String {
     return tokenBuilder.toString()
 }
 
-fun createDocumentTokens(tokens : List<String>) : Document {
+internal fun createDocumentTokens(tokens : List<String>) : Document {
     val operations : MutableList<Document.OperationTokens> = mutableListOf()
     val fragments : MutableList<Document.FragmentTokens> = mutableListOf()
 
@@ -87,13 +92,12 @@ fun createDocumentTokens(tokens : List<String>) : Document {
     return Document(fragments, operations)
 }
 
-fun createFragmentTokens(tokens : List<String>, startIndex: Int) : Pair<Int, Document.FragmentTokens>{
+private fun createFragmentTokens(tokens : List<String>, startIndex: Int) : Pair<Int, Document.FragmentTokens>{
     var index = startIndex
     var name : String? = null
     var typeCondition : String? = null
     while(index < tokens.size){
-        val token = tokens[index]
-        when(token) {
+        when(val token = tokens[index]) {
             "fragment" -> {
                 name = tokens[index + 1]
                 index++
@@ -115,7 +119,7 @@ fun createFragmentTokens(tokens : List<String>, startIndex: Int) : Pair<Int, Doc
     throw RequestException("Invalid fragment $name declaration without selection set")
 }
 
-fun createOperationTokens(tokens : List<String>, startIndex: Int) : Pair<Int, Document.OperationTokens>{
+private fun createOperationTokens(tokens : List<String>, startIndex: Int) : Pair<Int, Document.OperationTokens>{
     var index = startIndex
     var name : String? = null
     var type : String? = null
@@ -167,8 +171,8 @@ private fun parseOperationVariables(variablesTokens: List<String>): MutableList<
             }
             variableName == null -> variableName = variableToken
             variableType == null -> variableType = variableToken
-            variableType.startsWith("[") && variableType == "]" -> variableType += variableToken
-            variableType.startsWith("[")  -> variableType += variableToken
+            variableType.startsWith(("[")) && variableToken.startsWith("]") -> variableType += variableToken
+            variableType.startsWith("[") && !variableType.contains("]") -> variableType += variableToken
             defaultTypeStarted && variableDefaultValue == null -> variableDefaultValue = variableToken
             else -> {
                 //if variableName of variableType would be null, it would already be matched
@@ -186,9 +190,9 @@ private fun parseOperationVariables(variablesTokens: List<String>): MutableList<
     return operationVariables
 }
 
-val TYPE_WRAPPERS = arrayOf('!', '[', ']')
+private val TYPE_WRAPPERS = arrayOf('!', '[', ']')
 
-fun String.toTypeReference() : TypeReference {
+private fun String.toTypeReference() : TypeReference {
     val isNullable = not(endsWith("!"))
     val isList = startsWith("[") && (endsWith("]") || endsWith("]!"))
     val isElementNullable = isList && not(endsWith("!]") || endsWith("!]!"))
@@ -196,15 +200,15 @@ fun String.toTypeReference() : TypeReference {
     return TypeReference(name, isNullable, isList, isElementNullable)
 }
 
-fun indexOfClosingBracket(tokens: List<String>, startIndex: Int) : Int {
+private fun indexOfClosingBracket(tokens: List<String>, startIndex: Int) : Int {
     var nestedBrackets = 0
     val subList = tokens.subList(startIndex, tokens.size)
     subList.forEachIndexed { index, token ->
-        when(token){
+        when (token) {
             "{" -> nestedBrackets++
             "}" -> nestedBrackets--
         }
-        if(nestedBrackets == 0) return index + startIndex + 1
+        if (nestedBrackets == 0) return index + startIndex + 1
     }
     val indexOfTokenInString = getIndexOfTokenInString(tokens.subList(0, startIndex))
     throw RequestException("Missing closing bracket for opening bracket at $indexOfTokenInString")
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/request/RequestValidation.kt b/src/main/kotlin/com/apurebase/kgraphql/request/RequestValidation.kt
similarity index 88%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/request/RequestValidation.kt
rename to src/main/kotlin/com/apurebase/kgraphql/request/RequestValidation.kt
index 605aec5c..17dca161 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/request/RequestValidation.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/request/RequestValidation.kt
@@ -1,6 +1,6 @@
-package com.github.pgutkowski.kgraphql.request
+package com.apurebase.kgraphql.request
 
-import com.github.pgutkowski.kgraphql.RequestException
+import com.apurebase.kgraphql.RequestException
 
 fun validateAndFilterRequest(request : String) : String{
     return request
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/request/TypeReference.kt b/src/main/kotlin/com/apurebase/kgraphql/request/TypeReference.kt
similarity index 93%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/request/TypeReference.kt
rename to src/main/kotlin/com/apurebase/kgraphql/request/TypeReference.kt
index 8c1b2a85..9044f129 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/request/TypeReference.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/request/TypeReference.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql.request
+package com.apurebase.kgraphql.request
 
 /**
  * Raw reference to type, e.g. in query variables section '($var: [String!]!)', '[String!]!' is type reference
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/request/Variables.kt b/src/main/kotlin/com/apurebase/kgraphql/request/Variables.kt
similarity index 88%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/request/Variables.kt
rename to src/main/kotlin/com/apurebase/kgraphql/request/Variables.kt
index 92ddc1f9..6ba00085 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/request/Variables.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/request/Variables.kt
@@ -1,10 +1,10 @@
-package com.github.pgutkowski.kgraphql.request
+package com.apurebase.kgraphql.request
 
-import com.github.pgutkowski.kgraphql.ExecutionException
-import com.github.pgutkowski.kgraphql.RequestException
-import com.github.pgutkowski.kgraphql.getIterableElementType
-import com.github.pgutkowski.kgraphql.isIterable
-import com.github.pgutkowski.kgraphql.schema.structure2.LookupSchema
+import com.apurebase.kgraphql.ExecutionException
+import com.apurebase.kgraphql.RequestException
+import com.apurebase.kgraphql.getIterableElementType
+import com.apurebase.kgraphql.isIterable
+import com.apurebase.kgraphql.schema.structure2.LookupSchema
 import kotlin.reflect.KClass
 import kotlin.reflect.KType
 
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/request/VariablesJson.kt b/src/main/kotlin/com/apurebase/kgraphql/request/VariablesJson.kt
similarity index 89%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/request/VariablesJson.kt
rename to src/main/kotlin/com/apurebase/kgraphql/request/VariablesJson.kt
index edf7be9e..e55ea5fe 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/request/VariablesJson.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/request/VariablesJson.kt
@@ -1,12 +1,12 @@
-package com.github.pgutkowski.kgraphql.request
+package com.apurebase.kgraphql.request
 
 import com.fasterxml.jackson.databind.JavaType
 import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.type.TypeFactory
-import com.github.pgutkowski.kgraphql.ExecutionException
-import com.github.pgutkowski.kgraphql.getIterableElementType
-import com.github.pgutkowski.kgraphql.isIterable
+import com.apurebase.kgraphql.ExecutionException
+import com.apurebase.kgraphql.getIterableElementType
+import com.apurebase.kgraphql.isIterable
 import kotlin.reflect.KClass
 import kotlin.reflect.KType
 import kotlin.reflect.jvm.jvmErasure
diff --git a/src/main/kotlin/com/apurebase/kgraphql/request/graph/DirectiveInvocation.kt b/src/main/kotlin/com/apurebase/kgraphql/request/graph/DirectiveInvocation.kt
new file mode 100644
index 00000000..ca8a07fd
--- /dev/null
+++ b/src/main/kotlin/com/apurebase/kgraphql/request/graph/DirectiveInvocation.kt
@@ -0,0 +1,6 @@
+package com.apurebase.kgraphql.request.graph
+
+import com.apurebase.kgraphql.request.Arguments
+
+
+data class DirectiveInvocation(val key : String, val arguments: Arguments? = null)
\ No newline at end of file
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/request/graph/Fragment.kt b/src/main/kotlin/com/apurebase/kgraphql/request/graph/Fragment.kt
similarity index 95%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/request/graph/Fragment.kt
rename to src/main/kotlin/com/apurebase/kgraphql/request/graph/Fragment.kt
index 7b4c5942..31764685 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/request/graph/Fragment.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/request/graph/Fragment.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql.request.graph
+package com.apurebase.kgraphql.request.graph
 
 /**
  * fragment key needs to start with "..."
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/request/graph/SelectionNode.kt b/src/main/kotlin/com/apurebase/kgraphql/request/graph/SelectionNode.kt
similarity index 94%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/request/graph/SelectionNode.kt
rename to src/main/kotlin/com/apurebase/kgraphql/request/graph/SelectionNode.kt
index fdf7cc97..8734bb9b 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/request/graph/SelectionNode.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/request/graph/SelectionNode.kt
@@ -1,6 +1,6 @@
-package com.github.pgutkowski.kgraphql.request.graph
+package com.apurebase.kgraphql.request.graph
 
-import com.github.pgutkowski.kgraphql.request.Arguments
+import com.apurebase.kgraphql.request.Arguments
 
 open class SelectionNode(
         val key : String,
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/request/graph/SelectionTree.kt b/src/main/kotlin/com/apurebase/kgraphql/request/graph/SelectionTree.kt
similarity index 92%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/request/graph/SelectionTree.kt
rename to src/main/kotlin/com/apurebase/kgraphql/request/graph/SelectionTree.kt
index a2d24caa..045ce2df 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/request/graph/SelectionTree.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/request/graph/SelectionTree.kt
@@ -1,7 +1,7 @@
-package com.github.pgutkowski.kgraphql.request.graph
+package com.apurebase.kgraphql.request.graph
 
-import com.github.pgutkowski.kgraphql.RequestException
-import com.github.pgutkowski.kgraphql.request.Arguments
+import com.apurebase.kgraphql.RequestException
+import com.apurebase.kgraphql.request.Arguments
 import java.util.*
 
 
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/DefaultSchema.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/DefaultSchema.kt
similarity index 77%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/DefaultSchema.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/DefaultSchema.kt
index 09bee086..e890169d 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/DefaultSchema.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/DefaultSchema.kt
@@ -1,18 +1,18 @@
-package com.github.pgutkowski.kgraphql.schema
-
-import com.github.pgutkowski.kgraphql.Context
-import com.github.pgutkowski.kgraphql.RequestException
-import com.github.pgutkowski.kgraphql.configuration.SchemaConfiguration
-import com.github.pgutkowski.kgraphql.request.CachingDocumentParser
-import com.github.pgutkowski.kgraphql.request.DocumentParser
-import com.github.pgutkowski.kgraphql.request.VariablesJson
-import com.github.pgutkowski.kgraphql.schema.execution.ParallelRequestExecutor
-import com.github.pgutkowski.kgraphql.schema.execution.RequestExecutor
-import com.github.pgutkowski.kgraphql.schema.introspection.__Schema
-import com.github.pgutkowski.kgraphql.schema.structure2.LookupSchema
-import com.github.pgutkowski.kgraphql.schema.structure2.RequestInterpreter
-import com.github.pgutkowski.kgraphql.schema.structure2.SchemaModel
-import com.github.pgutkowski.kgraphql.schema.structure2.Type
+package com.apurebase.kgraphql.schema
+
+import com.apurebase.kgraphql.Context
+import com.apurebase.kgraphql.RequestException
+import com.apurebase.kgraphql.configuration.SchemaConfiguration
+import com.apurebase.kgraphql.request.CachingDocumentParser
+import com.apurebase.kgraphql.request.DocumentParser
+import com.apurebase.kgraphql.request.VariablesJson
+import com.apurebase.kgraphql.schema.execution.ParallelRequestExecutor
+import com.apurebase.kgraphql.schema.execution.RequestExecutor
+import com.apurebase.kgraphql.schema.introspection.__Schema
+import com.apurebase.kgraphql.schema.structure2.LookupSchema
+import com.apurebase.kgraphql.schema.structure2.RequestInterpreter
+import com.apurebase.kgraphql.schema.structure2.SchemaModel
+import com.apurebase.kgraphql.schema.structure2.Type
 import kotlin.reflect.KClass
 import kotlin.reflect.KType
 import kotlin.reflect.full.starProjectedType
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/Schema.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/Schema.kt
similarity index 60%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/Schema.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/Schema.kt
index 5c104b4b..f32263ab 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/Schema.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/Schema.kt
@@ -1,7 +1,7 @@
-package com.github.pgutkowski.kgraphql.schema
+package com.apurebase.kgraphql.schema
 
-import com.github.pgutkowski.kgraphql.Context
-import com.github.pgutkowski.kgraphql.schema.introspection.__Schema
+import com.apurebase.kgraphql.Context
+import com.apurebase.kgraphql.schema.introspection.__Schema
 
 
 interface Schema : __Schema {
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/SchemaException.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/SchemaException.kt
similarity index 67%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/SchemaException.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/SchemaException.kt
index c87cf3eb..5325bec9 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/SchemaException.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/SchemaException.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql.schema
+package com.apurebase.kgraphql.schema
 
 
 class SchemaException(message: String, cause: Throwable? = null) : Exception(message, cause)
\ No newline at end of file
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/builtin/BUILT_IN_TYPE.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/builtin/BUILT_IN_TYPE.kt
similarity index 90%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/builtin/BUILT_IN_TYPE.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/builtin/BUILT_IN_TYPE.kt
index 61492150..57913c2f 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/builtin/BUILT_IN_TYPE.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/builtin/BUILT_IN_TYPE.kt
@@ -1,11 +1,11 @@
-package com.github.pgutkowski.kgraphql.schema.builtin
-
-import com.github.pgutkowski.kgraphql.RequestException
-import com.github.pgutkowski.kgraphql.defaultKQLTypeName
-import com.github.pgutkowski.kgraphql.dropQuotes
-import com.github.pgutkowski.kgraphql.isLiteral
-import com.github.pgutkowski.kgraphql.schema.model.TypeDef
-import com.github.pgutkowski.kgraphql.schema.scalar.StringScalarCoercion
+package com.apurebase.kgraphql.schema.builtin
+
+import com.apurebase.kgraphql.RequestException
+import com.apurebase.kgraphql.defaultKQLTypeName
+import com.apurebase.kgraphql.dropQuotes
+import com.apurebase.kgraphql.isLiteral
+import com.apurebase.kgraphql.schema.model.TypeDef
+import com.apurebase.kgraphql.schema.scalar.StringScalarCoercion
 
 
 private val STRING_DESCRIPTION =
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/directive/Directive.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/directive/Directive.kt
similarity index 76%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/directive/Directive.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/directive/Directive.kt
index 4f22e026..59ce4fd7 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/directive/Directive.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/directive/Directive.kt
@@ -1,12 +1,12 @@
-package com.github.pgutkowski.kgraphql.schema.directive
+package com.apurebase.kgraphql.schema.directive
 
-import com.github.pgutkowski.kgraphql.schema.directive.DirectiveLocation.FIELD
-import com.github.pgutkowski.kgraphql.schema.directive.DirectiveLocation.FRAGMENT_SPREAD
-import com.github.pgutkowski.kgraphql.schema.directive.DirectiveLocation.INLINE_FRAGMENT
-import com.github.pgutkowski.kgraphql.schema.introspection.__Directive
-import com.github.pgutkowski.kgraphql.schema.introspection.__InputValue
-import com.github.pgutkowski.kgraphql.schema.model.FunctionWrapper
-import com.github.pgutkowski.kgraphql.schema.structure2.InputValue
+import com.apurebase.kgraphql.schema.directive.DirectiveLocation.FIELD
+import com.apurebase.kgraphql.schema.directive.DirectiveLocation.FRAGMENT_SPREAD
+import com.apurebase.kgraphql.schema.directive.DirectiveLocation.INLINE_FRAGMENT
+import com.apurebase.kgraphql.schema.introspection.__Directive
+import com.apurebase.kgraphql.schema.introspection.__InputValue
+import com.apurebase.kgraphql.schema.model.FunctionWrapper
+import com.apurebase.kgraphql.schema.structure2.InputValue
 
 /**
  * Directives provide a way to describe alternate runtime execution and type validation behavior in a GraphQL document.
diff --git a/src/main/kotlin/com/apurebase/kgraphql/schema/directive/DirectiveExecution.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/directive/DirectiveExecution.kt
new file mode 100644
index 00000000..5e2ef5e8
--- /dev/null
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/directive/DirectiveExecution.kt
@@ -0,0 +1,6 @@
+package com.apurebase.kgraphql.schema.directive
+
+import com.apurebase.kgraphql.schema.model.FunctionWrapper
+
+
+class DirectiveExecution(val function: FunctionWrapper<DirectiveResult>) : FunctionWrapper<DirectiveResult> by function
\ No newline at end of file
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/directive/DirectiveLocation.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/directive/DirectiveLocation.kt
similarity index 73%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/directive/DirectiveLocation.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/directive/DirectiveLocation.kt
index 19a619a8..2f1e03fa 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/directive/DirectiveLocation.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/directive/DirectiveLocation.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql.schema.directive
+package com.apurebase.kgraphql.schema.directive
 
 
 enum class DirectiveLocation {
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/directive/DirectiveResult.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/directive/DirectiveResult.kt
similarity index 79%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/directive/DirectiveResult.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/directive/DirectiveResult.kt
index 5ce1b131..a3f32d4c 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/directive/DirectiveResult.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/directive/DirectiveResult.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql.schema.directive
+package com.apurebase.kgraphql.schema.directive
 
 /**
  * right now its only wrapper for [include], but GraphQL creators foreshadowed that
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/BooleanScalarDSL.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/BooleanScalarDSL.kt
similarity index 72%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/BooleanScalarDSL.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/dsl/BooleanScalarDSL.kt
index b15d10e5..3b586f5f 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/BooleanScalarDSL.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/BooleanScalarDSL.kt
@@ -1,8 +1,8 @@
-package com.github.pgutkowski.kgraphql.schema.dsl
+package com.apurebase.kgraphql.schema.dsl
 
-import com.github.pgutkowski.kgraphql.schema.SchemaException
-import com.github.pgutkowski.kgraphql.schema.scalar.BooleanScalarCoercion
-import com.github.pgutkowski.kgraphql.schema.scalar.ScalarCoercion
+import com.apurebase.kgraphql.schema.SchemaException
+import com.apurebase.kgraphql.schema.scalar.BooleanScalarCoercion
+import com.apurebase.kgraphql.schema.scalar.ScalarCoercion
 import kotlin.reflect.KClass
 
 
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/DepreciableItemDSL.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/DepreciableItemDSL.kt
similarity index 83%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/DepreciableItemDSL.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/dsl/DepreciableItemDSL.kt
index 0d4ee25c..fd8c4002 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/DepreciableItemDSL.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/DepreciableItemDSL.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql.schema.dsl
+package com.apurebase.kgraphql.schema.dsl
 
 
 abstract class DepreciableItemDSL : ItemDSL() {
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/DoubleScalarDSL.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/DoubleScalarDSL.kt
similarity index 72%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/DoubleScalarDSL.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/dsl/DoubleScalarDSL.kt
index ac4f527d..ca4f124b 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/DoubleScalarDSL.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/DoubleScalarDSL.kt
@@ -1,8 +1,8 @@
-package com.github.pgutkowski.kgraphql.schema.dsl
+package com.apurebase.kgraphql.schema.dsl
 
-import com.github.pgutkowski.kgraphql.schema.SchemaException
-import com.github.pgutkowski.kgraphql.schema.scalar.DoubleScalarCoercion
-import com.github.pgutkowski.kgraphql.schema.scalar.ScalarCoercion
+import com.apurebase.kgraphql.schema.SchemaException
+import com.apurebase.kgraphql.schema.scalar.DoubleScalarCoercion
+import com.apurebase.kgraphql.schema.scalar.ScalarCoercion
 import kotlin.reflect.KClass
 
 
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/EnumDSL.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/EnumDSL.kt
similarity index 83%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/EnumDSL.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/dsl/EnumDSL.kt
index c741d489..66e44064 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/EnumDSL.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/EnumDSL.kt
@@ -1,6 +1,6 @@
-package com.github.pgutkowski.kgraphql.schema.dsl
+package com.apurebase.kgraphql.schema.dsl
 
-import com.github.pgutkowski.kgraphql.defaultKQLTypeName
+import com.apurebase.kgraphql.defaultKQLTypeName
 import kotlin.reflect.KClass
 
 
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/EnumValueDSL.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/EnumValueDSL.kt
similarity index 74%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/EnumValueDSL.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/dsl/EnumValueDSL.kt
index f101b881..1f4f5f84 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/EnumValueDSL.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/EnumValueDSL.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql.schema.dsl
+package com.apurebase.kgraphql.schema.dsl
 
 
 class EnumValueDSL<T : Enum<T>>(val value : T, block : EnumValueDSL<T>.() -> Unit) : DepreciableItemDSL(){
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/InputTypeDSL.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/InputTypeDSL.kt
similarity index 67%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/InputTypeDSL.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/dsl/InputTypeDSL.kt
index 6ba79400..d02bc292 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/InputTypeDSL.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/InputTypeDSL.kt
@@ -1,6 +1,6 @@
-package com.github.pgutkowski.kgraphql.schema.dsl
+package com.apurebase.kgraphql.schema.dsl
 
-import com.github.pgutkowski.kgraphql.defaultKQLTypeName
+import com.apurebase.kgraphql.defaultKQLTypeName
 import kotlin.reflect.KClass
 
 
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/InputValueDSL.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/InputValueDSL.kt
similarity index 82%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/InputValueDSL.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/dsl/InputValueDSL.kt
index 0f278a3d..fcd9c95a 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/InputValueDSL.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/InputValueDSL.kt
@@ -1,6 +1,6 @@
-package com.github.pgutkowski.kgraphql.schema.dsl
+package com.apurebase.kgraphql.schema.dsl
 
-import com.github.pgutkowski.kgraphql.schema.model.InputValueDef
+import com.apurebase.kgraphql.schema.model.InputValueDef
 import kotlin.reflect.KClass
 
 
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/InputValuesDSL.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/InputValuesDSL.kt
similarity index 89%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/InputValuesDSL.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/dsl/InputValuesDSL.kt
index 5107024c..66a6f6cc 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/InputValuesDSL.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/InputValuesDSL.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql.schema.dsl
+package com.apurebase.kgraphql.schema.dsl
 
 import kotlin.reflect.KClass
 
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/IntScalarDSL.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/IntScalarDSL.kt
similarity index 72%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/IntScalarDSL.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/dsl/IntScalarDSL.kt
index 35b984e0..40b85e1a 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/IntScalarDSL.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/IntScalarDSL.kt
@@ -1,8 +1,8 @@
-package com.github.pgutkowski.kgraphql.schema.dsl
+package com.apurebase.kgraphql.schema.dsl
 
-import com.github.pgutkowski.kgraphql.schema.SchemaException
-import com.github.pgutkowski.kgraphql.schema.scalar.IntScalarCoercion
-import com.github.pgutkowski.kgraphql.schema.scalar.ScalarCoercion
+import com.apurebase.kgraphql.schema.SchemaException
+import com.apurebase.kgraphql.schema.scalar.IntScalarCoercion
+import com.apurebase.kgraphql.schema.scalar.ScalarCoercion
 import kotlin.reflect.KClass
 
 
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/ItemDSL.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/ItemDSL.kt
similarity index 62%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/ItemDSL.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/dsl/ItemDSL.kt
index 2f7cde2a..a013dfec 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/ItemDSL.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/ItemDSL.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql.schema.dsl
+package com.apurebase.kgraphql.schema.dsl
 
 @SchemaBuilderMarker
 abstract class ItemDSL {
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/KotlinPropertyDSL.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/KotlinPropertyDSL.kt
similarity index 85%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/KotlinPropertyDSL.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/dsl/KotlinPropertyDSL.kt
index 9e529d98..2ca1d121 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/KotlinPropertyDSL.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/KotlinPropertyDSL.kt
@@ -1,7 +1,7 @@
-package com.github.pgutkowski.kgraphql.schema.dsl
+package com.apurebase.kgraphql.schema.dsl
 
-import com.github.pgutkowski.kgraphql.Context
-import com.github.pgutkowski.kgraphql.schema.model.PropertyDef
+import com.apurebase.kgraphql.Context
+import com.apurebase.kgraphql.schema.model.PropertyDef
 import java.lang.IllegalArgumentException
 import kotlin.reflect.KProperty1
 
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/LimitedAccessItemDSL.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/LimitedAccessItemDSL.kt
similarity index 73%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/LimitedAccessItemDSL.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/dsl/LimitedAccessItemDSL.kt
index 3084ec9c..fb017b4a 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/LimitedAccessItemDSL.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/LimitedAccessItemDSL.kt
@@ -1,6 +1,6 @@
-package com.github.pgutkowski.kgraphql.schema.dsl
+package com.apurebase.kgraphql.schema.dsl
 
-import com.github.pgutkowski.kgraphql.Context
+import com.apurebase.kgraphql.Context
 
 
 abstract class LimitedAccessItemDSL<PARENT> : DepreciableItemDSL() {
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/LongScalarDSL.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/LongScalarDSL.kt
similarity index 72%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/LongScalarDSL.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/dsl/LongScalarDSL.kt
index 371c7f7e..a1ce0e1b 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/LongScalarDSL.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/LongScalarDSL.kt
@@ -1,8 +1,8 @@
-package com.github.pgutkowski.kgraphql.schema.dsl
+package com.apurebase.kgraphql.schema.dsl
 
-import com.github.pgutkowski.kgraphql.schema.SchemaException
-import com.github.pgutkowski.kgraphql.schema.scalar.LongScalarCoercion
-import com.github.pgutkowski.kgraphql.schema.scalar.ScalarCoercion
+import com.apurebase.kgraphql.schema.SchemaException
+import com.apurebase.kgraphql.schema.scalar.LongScalarCoercion
+import com.apurebase.kgraphql.schema.scalar.ScalarCoercion
 import kotlin.reflect.KClass
 
 
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/PropertyDSL.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/PropertyDSL.kt
similarity index 64%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/PropertyDSL.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/dsl/PropertyDSL.kt
index b9bbbd3d..3f43dc59 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/PropertyDSL.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/PropertyDSL.kt
@@ -1,9 +1,9 @@
-package com.github.pgutkowski.kgraphql.schema.dsl
+package com.apurebase.kgraphql.schema.dsl
 
-import com.github.pgutkowski.kgraphql.Context
-import com.github.pgutkowski.kgraphql.schema.model.FunctionWrapper
-import com.github.pgutkowski.kgraphql.schema.model.InputValueDef
-import com.github.pgutkowski.kgraphql.schema.model.PropertyDef
+import com.apurebase.kgraphql.Context
+import com.apurebase.kgraphql.schema.model.FunctionWrapper
+import com.apurebase.kgraphql.schema.model.InputValueDef
+import com.apurebase.kgraphql.schema.model.PropertyDef
 import java.lang.IllegalArgumentException
 
 
@@ -40,6 +40,24 @@ class PropertyDSL<T : Any, R>(val name : String, block : PropertyDSL<T, R>.() ->
     fun <E, W, Q, A, S>resolver(function: (T, E, W, Q, A, S) -> R)
             = resolver(FunctionWrapper.on(function, true))
 
+    fun suspendResolver(function: suspend (T) -> R)
+            = resolver(FunctionWrapper.onSuspend(function, true))
+
+    fun <E>suspendResolver(function: suspend (T, E) -> R)
+            = resolver(FunctionWrapper.onSuspend(function, true))
+
+    fun <E, W>suspendResolver(function: suspend (T, E, W) -> R)
+            = resolver(FunctionWrapper.onSuspend(function, true))
+
+    fun <E, W, Q>suspendResolver(function: suspend (T, E, W, Q) -> R)
+            = resolver(FunctionWrapper.onSuspend(function, true))
+
+    fun <E, W, Q, A>suspendResolver(function: suspend (T, E, W, Q, A) -> R)
+            = resolver(FunctionWrapper.onSuspend(function, true))
+
+    fun <E, W, Q, A, S>suspendResolver(function: suspend (T, E, W, Q, A, S) -> R)
+            = resolver(FunctionWrapper.onSuspend(function, true))
+
     fun accessRule(rule: (T, Context) -> Exception?){
 
         val accessRuleAdapter: (T?, Context) -> Exception? = { parent, ctx ->
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/QueryOrMutationDSL.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/QueryOrMutationDSL.kt
similarity index 90%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/QueryOrMutationDSL.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/dsl/QueryOrMutationDSL.kt
index fe64efef..f436a8a8 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/QueryOrMutationDSL.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/QueryOrMutationDSL.kt
@@ -1,10 +1,10 @@
-package com.github.pgutkowski.kgraphql.schema.dsl
+package com.apurebase.kgraphql.schema.dsl
 
-import com.github.pgutkowski.kgraphql.Context
-import com.github.pgutkowski.kgraphql.schema.model.FunctionWrapper
-import com.github.pgutkowski.kgraphql.schema.model.InputValueDef
-import com.github.pgutkowski.kgraphql.schema.model.MutationDef
-import com.github.pgutkowski.kgraphql.schema.model.QueryDef
+import com.apurebase.kgraphql.Context
+import com.apurebase.kgraphql.schema.model.FunctionWrapper
+import com.apurebase.kgraphql.schema.model.InputValueDef
+import com.apurebase.kgraphql.schema.model.MutationDef
+import com.apurebase.kgraphql.schema.model.QueryDef
 
 
 class QueryOrMutationDSL(
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/ResolverDSL.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/ResolverDSL.kt
similarity index 77%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/ResolverDSL.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/dsl/ResolverDSL.kt
index 061159c7..d3ff9801 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/ResolverDSL.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/ResolverDSL.kt
@@ -1,6 +1,6 @@
-package com.github.pgutkowski.kgraphql.schema.dsl
+package com.apurebase.kgraphql.schema.dsl
 
-import com.github.pgutkowski.kgraphql.schema.model.InputValueDef
+import com.apurebase.kgraphql.schema.model.InputValueDef
 
 
 class ResolverDSL(private val target: Target) {
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/ScalarDSL.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/ScalarDSL.kt
similarity index 81%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/ScalarDSL.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/dsl/ScalarDSL.kt
index 3c3c86e7..4a204f32 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/ScalarDSL.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/ScalarDSL.kt
@@ -1,7 +1,7 @@
-package com.github.pgutkowski.kgraphql.schema.dsl
+package com.apurebase.kgraphql.schema.dsl
 
-import com.github.pgutkowski.kgraphql.defaultKQLTypeName
-import com.github.pgutkowski.kgraphql.schema.scalar.ScalarCoercion
+import com.apurebase.kgraphql.defaultKQLTypeName
+import com.apurebase.kgraphql.schema.scalar.ScalarCoercion
 import kotlin.reflect.KClass
 
 
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/SchemaBuilder.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/SchemaBuilder.kt
similarity index 94%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/SchemaBuilder.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/dsl/SchemaBuilder.kt
index bf82d2cd..c3ca5ec4 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/SchemaBuilder.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/SchemaBuilder.kt
@@ -1,15 +1,15 @@
-package com.github.pgutkowski.kgraphql.schema.dsl
+package com.apurebase.kgraphql.schema.dsl
 
 import com.fasterxml.jackson.core.JsonParser
 import com.fasterxml.jackson.databind.DeserializationContext
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer
 import com.fasterxml.jackson.databind.module.SimpleModule
-import com.github.pgutkowski.kgraphql.schema.Schema
-import com.github.pgutkowski.kgraphql.schema.SchemaException
-import com.github.pgutkowski.kgraphql.schema.model.EnumValueDef
-import com.github.pgutkowski.kgraphql.schema.model.TypeDef
-import com.github.pgutkowski.kgraphql.schema.model.MutableSchemaDefinition
-import com.github.pgutkowski.kgraphql.schema.structure2.SchemaCompilation
+import com.apurebase.kgraphql.schema.Schema
+import com.apurebase.kgraphql.schema.SchemaException
+import com.apurebase.kgraphql.schema.model.EnumValueDef
+import com.apurebase.kgraphql.schema.model.TypeDef
+import com.apurebase.kgraphql.schema.model.MutableSchemaDefinition
+import com.apurebase.kgraphql.schema.structure2.SchemaCompilation
 import kotlin.reflect.KClass
 
 /**
diff --git a/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/SchemaBuilderMarker.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/SchemaBuilderMarker.kt
new file mode 100644
index 00000000..58e82bcc
--- /dev/null
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/SchemaBuilderMarker.kt
@@ -0,0 +1,4 @@
+package com.apurebase.kgraphql.schema.dsl
+
+@DslMarker
+annotation class SchemaBuilderMarker
\ No newline at end of file
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/SchemaConfigurationDSL.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/SchemaConfigurationDSL.kt
similarity index 90%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/SchemaConfigurationDSL.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/dsl/SchemaConfigurationDSL.kt
index 1e5607a8..c8afcb97 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/SchemaConfigurationDSL.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/SchemaConfigurationDSL.kt
@@ -1,9 +1,9 @@
-package com.github.pgutkowski.kgraphql.schema.dsl
+package com.apurebase.kgraphql.schema.dsl
 
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import com.github.pgutkowski.kgraphql.configuration.SchemaConfiguration
+import com.apurebase.kgraphql.configuration.SchemaConfiguration
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/StringScalarDSL.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/StringScalarDSL.kt
similarity index 72%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/StringScalarDSL.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/dsl/StringScalarDSL.kt
index 2bcc1ca4..7d8aa79b 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/StringScalarDSL.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/StringScalarDSL.kt
@@ -1,8 +1,8 @@
-package com.github.pgutkowski.kgraphql.schema.dsl
+package com.apurebase.kgraphql.schema.dsl
 
-import com.github.pgutkowski.kgraphql.schema.SchemaException
-import com.github.pgutkowski.kgraphql.schema.scalar.ScalarCoercion
-import com.github.pgutkowski.kgraphql.schema.scalar.StringScalarCoercion
+import com.apurebase.kgraphql.schema.SchemaException
+import com.apurebase.kgraphql.schema.scalar.ScalarCoercion
+import com.apurebase.kgraphql.schema.scalar.StringScalarCoercion
 import kotlin.reflect.KClass
 
 
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/TypeDSL.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/TypeDSL.kt
similarity index 88%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/TypeDSL.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/dsl/TypeDSL.kt
index a817a7a1..f8325f92 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/TypeDSL.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/TypeDSL.kt
@@ -1,11 +1,11 @@
-package com.github.pgutkowski.kgraphql.schema.dsl
-
-import com.github.pgutkowski.kgraphql.defaultKQLTypeName
-import com.github.pgutkowski.kgraphql.schema.SchemaException
-import com.github.pgutkowski.kgraphql.schema.model.FunctionWrapper
-import com.github.pgutkowski.kgraphql.schema.model.PropertyDef
-import com.github.pgutkowski.kgraphql.schema.model.TypeDef
-import com.github.pgutkowski.kgraphql.schema.model.Transformation
+package com.apurebase.kgraphql.schema.dsl
+
+import com.apurebase.kgraphql.defaultKQLTypeName
+import com.apurebase.kgraphql.schema.SchemaException
+import com.apurebase.kgraphql.schema.model.FunctionWrapper
+import com.apurebase.kgraphql.schema.model.PropertyDef
+import com.apurebase.kgraphql.schema.model.TypeDef
+import com.apurebase.kgraphql.schema.model.Transformation
 import kotlin.reflect.KClass
 import kotlin.reflect.KProperty1
 
diff --git a/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/TypeID.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/TypeID.kt
new file mode 100644
index 00000000..b0b4b2b6
--- /dev/null
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/TypeID.kt
@@ -0,0 +1,4 @@
+package com.apurebase.kgraphql.schema.dsl
+
+
+data class TypeID(val typeID: String)
\ No newline at end of file
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/UnionPropertyDSL.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/UnionPropertyDSL.kt
similarity index 85%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/UnionPropertyDSL.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/dsl/UnionPropertyDSL.kt
index 07edeb3b..7fdeec53 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/UnionPropertyDSL.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/UnionPropertyDSL.kt
@@ -1,10 +1,10 @@
-package com.github.pgutkowski.kgraphql.schema.dsl
+package com.apurebase.kgraphql.schema.dsl
 
-import com.github.pgutkowski.kgraphql.Context
-import com.github.pgutkowski.kgraphql.schema.model.FunctionWrapper
-import com.github.pgutkowski.kgraphql.schema.model.InputValueDef
-import com.github.pgutkowski.kgraphql.schema.model.PropertyDef
-import com.github.pgutkowski.kgraphql.schema.model.TypeDef
+import com.apurebase.kgraphql.Context
+import com.apurebase.kgraphql.schema.model.FunctionWrapper
+import com.apurebase.kgraphql.schema.model.InputValueDef
+import com.apurebase.kgraphql.schema.model.PropertyDef
+import com.apurebase.kgraphql.schema.model.TypeDef
 import java.lang.IllegalArgumentException
 
 
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/UnionTypeDSL.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/UnionTypeDSL.kt
similarity index 87%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/UnionTypeDSL.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/dsl/UnionTypeDSL.kt
index 354c874f..2b9917c9 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/UnionTypeDSL.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/UnionTypeDSL.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql.schema.dsl
+package com.apurebase.kgraphql.schema.dsl
 
 import kotlin.reflect.KClass
 
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/execution/ArgumentTransformer.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/execution/ArgumentTransformer.kt
similarity index 81%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/execution/ArgumentTransformer.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/execution/ArgumentTransformer.kt
index 7635ea98..bc559525 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/execution/ArgumentTransformer.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/execution/ArgumentTransformer.kt
@@ -1,13 +1,13 @@
-package com.github.pgutkowski.kgraphql.schema.execution
+package com.apurebase.kgraphql.schema.execution
 
-import com.github.pgutkowski.kgraphql.ExecutionException
-import com.github.pgutkowski.kgraphql.RequestException
-import com.github.pgutkowski.kgraphql.isLiteral
-import com.github.pgutkowski.kgraphql.request.Variables
-import com.github.pgutkowski.kgraphql.schema.DefaultSchema
-import com.github.pgutkowski.kgraphql.schema.scalar.deserializeScalar
-import com.github.pgutkowski.kgraphql.schema.structure2.InputValue
-import com.github.pgutkowski.kgraphql.schema.structure2.Type
+import com.apurebase.kgraphql.ExecutionException
+import com.apurebase.kgraphql.RequestException
+import com.apurebase.kgraphql.isLiteral
+import com.apurebase.kgraphql.request.Variables
+import com.apurebase.kgraphql.schema.DefaultSchema
+import com.apurebase.kgraphql.schema.scalar.deserializeScalar
+import com.apurebase.kgraphql.schema.structure2.InputValue
+import com.apurebase.kgraphql.schema.structure2.Type
 import kotlin.reflect.KType
 import kotlin.reflect.jvm.jvmErasure
 
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/execution/ArgumentsHandler.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/execution/ArgumentsHandler.kt
similarity index 83%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/execution/ArgumentsHandler.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/execution/ArgumentsHandler.kt
index d6669322..e4f30fcf 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/execution/ArgumentsHandler.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/execution/ArgumentsHandler.kt
@@ -1,13 +1,13 @@
-package com.github.pgutkowski.kgraphql.schema.execution
+package com.apurebase.kgraphql.schema.execution
 
-import com.github.pgutkowski.kgraphql.Context
-import com.github.pgutkowski.kgraphql.ExecutionException
-import com.github.pgutkowski.kgraphql.RequestException
-import com.github.pgutkowski.kgraphql.request.Arguments
-import com.github.pgutkowski.kgraphql.request.Variables
-import com.github.pgutkowski.kgraphql.schema.DefaultSchema
-import com.github.pgutkowski.kgraphql.schema.introspection.TypeKind
-import com.github.pgutkowski.kgraphql.schema.structure2.InputValue
+import com.apurebase.kgraphql.Context
+import com.apurebase.kgraphql.ExecutionException
+import com.apurebase.kgraphql.RequestException
+import com.apurebase.kgraphql.request.Arguments
+import com.apurebase.kgraphql.request.Variables
+import com.apurebase.kgraphql.schema.DefaultSchema
+import com.apurebase.kgraphql.schema.introspection.TypeKind
+import com.apurebase.kgraphql.schema.structure2.InputValue
 
 
 internal class ArgumentsHandler(schema : DefaultSchema) : ArgumentTransformer(schema) {
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/execution/Execution.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/execution/Execution.kt
similarity index 81%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/execution/Execution.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/execution/Execution.kt
index 4d6ef600..319cb9ee 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/execution/Execution.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/execution/Execution.kt
@@ -1,10 +1,10 @@
-package com.github.pgutkowski.kgraphql.schema.execution
+package com.apurebase.kgraphql.schema.execution
 
-import com.github.pgutkowski.kgraphql.request.Arguments
-import com.github.pgutkowski.kgraphql.request.OperationVariable
-import com.github.pgutkowski.kgraphql.schema.directive.Directive
-import com.github.pgutkowski.kgraphql.schema.structure2.Field
-import com.github.pgutkowski.kgraphql.schema.structure2.Type
+import com.apurebase.kgraphql.request.Arguments
+import com.apurebase.kgraphql.request.OperationVariable
+import com.apurebase.kgraphql.schema.directive.Directive
+import com.apurebase.kgraphql.schema.structure2.Field
+import com.apurebase.kgraphql.schema.structure2.Type
 
 
 sealed class Execution {
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/execution/ExecutionPlan.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/execution/ExecutionPlan.kt
similarity index 65%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/execution/ExecutionPlan.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/execution/ExecutionPlan.kt
index f253ccf9..61e76389 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/execution/ExecutionPlan.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/execution/ExecutionPlan.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql.schema.execution
+package com.apurebase.kgraphql.schema.execution
 
 class ExecutionPlan (
         val operations: List<Execution.Node>
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/execution/ParallelRequestExecutor.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/execution/ParallelRequestExecutor.kt
similarity index 82%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/execution/ParallelRequestExecutor.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/execution/ParallelRequestExecutor.kt
index 1b557e65..5f50ced8 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/execution/ParallelRequestExecutor.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/execution/ParallelRequestExecutor.kt
@@ -1,28 +1,25 @@
-package com.github.pgutkowski.kgraphql.schema.execution
+package com.apurebase.kgraphql.schema.execution
 
 import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.node.JsonNodeFactory
 import com.fasterxml.jackson.databind.node.NullNode
 import com.fasterxml.jackson.databind.node.ObjectNode
-import com.github.pgutkowski.kgraphql.Context
-import com.github.pgutkowski.kgraphql.ExecutionException
-import com.github.pgutkowski.kgraphql.request.Arguments
-import com.github.pgutkowski.kgraphql.request.Variables
-import com.github.pgutkowski.kgraphql.request.VariablesJson
-import com.github.pgutkowski.kgraphql.schema.DefaultSchema
-import com.github.pgutkowski.kgraphql.schema.directive.Directive
-import com.github.pgutkowski.kgraphql.schema.introspection.TypeKind
-import com.github.pgutkowski.kgraphql.schema.model.FunctionWrapper
-import com.github.pgutkowski.kgraphql.schema.model.TypeDef
-import com.github.pgutkowski.kgraphql.schema.scalar.serializeScalar
-import com.github.pgutkowski.kgraphql.schema.structure2.Field
-import com.github.pgutkowski.kgraphql.schema.structure2.InputValue
-import com.github.pgutkowski.kgraphql.schema.structure2.Type
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Job
+import com.apurebase.kgraphql.Context
+import com.apurebase.kgraphql.ExecutionException
+import com.apurebase.kgraphql.request.Arguments
+import com.apurebase.kgraphql.request.Variables
+import com.apurebase.kgraphql.request.VariablesJson
+import com.apurebase.kgraphql.schema.DefaultSchema
+import com.apurebase.kgraphql.schema.directive.Directive
+import com.apurebase.kgraphql.schema.introspection.TypeKind
+import com.apurebase.kgraphql.schema.model.FunctionWrapper
+import com.apurebase.kgraphql.schema.model.TypeDef
+import com.apurebase.kgraphql.schema.scalar.serializeScalar
+import com.apurebase.kgraphql.schema.structure2.Field
+import com.apurebase.kgraphql.schema.structure2.InputValue
+import com.apurebase.kgraphql.schema.structure2.Type
+import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
 import kotlin.coroutines.CoroutineContext
 import kotlin.reflect.KProperty1
 
@@ -51,36 +48,14 @@ class ParallelRequestExecutor(val schema: DefaultSchema) : RequestExecutor, Coro
     override suspend fun suspendExecute(plan: ExecutionPlan, variables: VariablesJson, context: Context): String {
         val root = jsonNodeFactory.objectNode()
         val data = root.putObject("data")
-        val channel = Channel<Pair<Execution, JsonNode>>()
-        val jobs = plan
-                .map { execution ->
-                    launch(dispatcher) {
-                        try {
-                            val writeOperation = writeOperation(
-                                    ctx = ExecutionContext(Variables(schema, variables, execution.variables), context),
-                                    node = execution,
-                                    operation = execution.field as Field.Function<*, *>
-                            )
-                            channel.send(execution to writeOperation)
-                        } catch (e: Exception) {
-                            channel.close(e)
-                        }
-                    }
-                }
-                .toList()
 
-        //intermediate data structure necessary to preserve ordering
-        val resultMap = mutableMapOf<Execution, JsonNode>()
-        repeat(plan.size) {
-            try {
-                val (execution, jsonNode) = channel.receive()
-                resultMap.put(execution, jsonNode)
-            } catch (e: Exception) {
-                jobs.forEach { it.cancel() }
-                throw e
-            }
+        val resultMap = plan.toMapAsync {
+            writeOperation(
+                ctx = ExecutionContext(Variables(schema, variables, it.variables), context),
+                node = it,
+                operation = it.field as Field.Function<*, *>
+            )
         }
-        channel.close()
 
         for (operation in plan) {
             data.set(operation.aliasOrKey, resultMap[operation])
@@ -93,6 +68,33 @@ class ParallelRequestExecutor(val schema: DefaultSchema) : RequestExecutor, Coro
         suspendExecute(plan, variables, context)
     }
 
+    private suspend fun <T, R> Collection<T>.toMapAsync(block: suspend (T) -> R): Map<T, R> = coroutineScope {
+        val channel = Channel<Pair<T, R>>()
+        val jobs = map { item ->
+            launch(dispatcher) {
+                try {
+                    val res = block(item)
+                    channel.send(item to res)
+                } catch (e: Exception) {
+                    channel.close(e)
+                }
+            }
+        }
+        val resultMap = mutableMapOf<T, R>()
+        repeat(size) {
+            try {
+                val (item, result) = channel.receive()
+                resultMap[item] = result
+            } catch (e: Exception) {
+                jobs.forEach(Job::cancel)
+                throw e
+            }
+        }
+
+        channel.close()
+        resultMap
+    }
+
     private suspend fun <T> writeOperation(ctx: ExecutionContext, node: Execution.Node, operation: FunctionWrapper<T>): JsonNode {
         node.field.checkAccess(null, ctx.requestContext)
         val operationResult: T? = operation.invoke(
@@ -134,9 +136,12 @@ class ParallelRequestExecutor(val schema: DefaultSchema) : RequestExecutor, Coro
             //check value, not returnType, because this method can be invoked with element value
             value is Collection<*> -> {
                 if (returnType.isList()) {
-                    val arrayNode = jsonNodeFactory.arrayNode(value.size)
-                    value.forEach { element -> arrayNode.add(createNode(ctx, element, node, returnType.unwrapList())) }
-                    arrayNode
+                    val valuesMap = value.toMapAsync {
+                        createNode(ctx, it, node, returnType.unwrapList())
+                    }
+                    value.fold(jsonNodeFactory.arrayNode(value.size)) { array, v ->
+                        array.add(valuesMap[v])
+                    }
                 } else {
                     throw ExecutionException("Invalid collection value for non collection property")
                 }
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/execution/RequestExecutor.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/execution/RequestExecutor.kt
similarity index 58%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/execution/RequestExecutor.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/execution/RequestExecutor.kt
index 1a7c8af7..9d1ab47e 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/execution/RequestExecutor.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/execution/RequestExecutor.kt
@@ -1,7 +1,7 @@
-package com.github.pgutkowski.kgraphql.schema.execution
+package com.apurebase.kgraphql.schema.execution
 
-import com.github.pgutkowski.kgraphql.Context
-import com.github.pgutkowski.kgraphql.request.VariablesJson
+import com.apurebase.kgraphql.Context
+import com.apurebase.kgraphql.request.VariablesJson
 
 
 interface RequestExecutor {
diff --git a/src/main/kotlin/com/apurebase/kgraphql/schema/execution/TypeCondition.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/execution/TypeCondition.kt
new file mode 100644
index 00000000..5a56db01
--- /dev/null
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/execution/TypeCondition.kt
@@ -0,0 +1,8 @@
+package com.apurebase.kgraphql.schema.execution
+
+import com.apurebase.kgraphql.schema.structure2.Type
+
+/**
+ * type conditions can be declared on fragments
+ */
+class TypeCondition(val type: Type)
diff --git a/src/main/kotlin/com/apurebase/kgraphql/schema/introspection/NotIntrospected.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/introspection/NotIntrospected.kt
new file mode 100644
index 00000000..7530e554
--- /dev/null
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/introspection/NotIntrospected.kt
@@ -0,0 +1,4 @@
+package com.apurebase.kgraphql.schema.introspection
+
+
+annotation class NotIntrospected
\ No newline at end of file
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/introspection/SchemaProxy.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/introspection/SchemaProxy.kt
similarity index 86%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/introspection/SchemaProxy.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/introspection/SchemaProxy.kt
index 4c3f914a..5db54bb0 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/introspection/SchemaProxy.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/introspection/SchemaProxy.kt
@@ -1,8 +1,8 @@
-package com.github.pgutkowski.kgraphql.schema.introspection
+package com.apurebase.kgraphql.schema.introspection
 
-import com.github.pgutkowski.kgraphql.Context
-import com.github.pgutkowski.kgraphql.schema.structure2.LookupSchema
-import com.github.pgutkowski.kgraphql.schema.structure2.Type
+import com.apurebase.kgraphql.Context
+import com.apurebase.kgraphql.schema.structure2.LookupSchema
+import com.apurebase.kgraphql.schema.structure2.Type
 import kotlin.reflect.KClass
 import kotlin.reflect.KType
 
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/introspection/TypeKind.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/introspection/TypeKind.kt
similarity index 71%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/introspection/TypeKind.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/introspection/TypeKind.kt
index e6665ef8..a900ac92 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/introspection/TypeKind.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/introspection/TypeKind.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql.schema.introspection
+package com.apurebase.kgraphql.schema.introspection
 
 
 enum class TypeKind {
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/introspection/__Described.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/introspection/__Described.kt
similarity index 57%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/introspection/__Described.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/introspection/__Described.kt
index afc60379..6ab99059 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/introspection/__Described.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/introspection/__Described.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql.schema.introspection
+package com.apurebase.kgraphql.schema.introspection
 
 
 interface __Described {
diff --git a/src/main/kotlin/com/apurebase/kgraphql/schema/introspection/__Directive.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/introspection/__Directive.kt
new file mode 100644
index 00000000..b89457dd
--- /dev/null
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/introspection/__Directive.kt
@@ -0,0 +1,11 @@
+package com.apurebase.kgraphql.schema.introspection
+
+import com.apurebase.kgraphql.schema.directive.DirectiveLocation
+
+
+interface __Directive : __Described {
+
+    val locations : List<DirectiveLocation>
+
+    val args: List<__InputValue>
+}
\ No newline at end of file
diff --git a/src/main/kotlin/com/apurebase/kgraphql/schema/introspection/__EnumValue.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/introspection/__EnumValue.kt
new file mode 100644
index 00000000..d0568e35
--- /dev/null
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/introspection/__EnumValue.kt
@@ -0,0 +1,6 @@
+package com.apurebase.kgraphql.schema.introspection
+
+import com.apurebase.kgraphql.schema.model.Depreciable
+
+
+interface __EnumValue: Depreciable, __Described
\ No newline at end of file
diff --git a/src/main/kotlin/com/apurebase/kgraphql/schema/introspection/__Field.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/introspection/__Field.kt
new file mode 100644
index 00000000..afb1b7a2
--- /dev/null
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/introspection/__Field.kt
@@ -0,0 +1,11 @@
+package com.apurebase.kgraphql.schema.introspection
+
+import com.apurebase.kgraphql.schema.model.Depreciable
+
+
+interface __Field : Depreciable, __Described {
+
+    val type: __Type
+
+    val args: List<__InputValue>
+}
\ No newline at end of file
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/introspection/__InputValue.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/introspection/__InputValue.kt
similarity index 61%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/introspection/__InputValue.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/introspection/__InputValue.kt
index 1038cb31..25be8ac6 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/introspection/__InputValue.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/introspection/__InputValue.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql.schema.introspection
+package com.apurebase.kgraphql.schema.introspection
 
 
 interface __InputValue : __Described {
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/introspection/__Schema.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/introspection/__Schema.kt
similarity index 79%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/introspection/__Schema.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/introspection/__Schema.kt
index 6e729417..47c208ee 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/introspection/__Schema.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/introspection/__Schema.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql.schema.introspection
+package com.apurebase.kgraphql.schema.introspection
 
 
 interface __Schema {
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/introspection/__Type.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/introspection/__Type.kt
similarity index 94%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/introspection/__Type.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/introspection/__Type.kt
index a2fff014..9cd56bf9 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/introspection/__Type.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/introspection/__Type.kt
@@ -1,5 +1,5 @@
 
-package com.github.pgutkowski.kgraphql.schema.introspection
+package com.apurebase.kgraphql.schema.introspection
 
 /**
  * GraphQL introspection system defines __Type to represent all of TypeKinds
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/BaseOperationDef.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/model/BaseOperationDef.kt
similarity index 75%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/BaseOperationDef.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/model/BaseOperationDef.kt
index e5152cde..c57fff41 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/BaseOperationDef.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/model/BaseOperationDef.kt
@@ -1,6 +1,6 @@
-package com.github.pgutkowski.kgraphql.schema.model
+package com.apurebase.kgraphql.schema.model
 
-import com.github.pgutkowski.kgraphql.Context
+import com.apurebase.kgraphql.Context
 
 abstract class BaseOperationDef<T, R>(
         name : String,
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/Definition.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/model/Definition.kt
similarity index 74%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/Definition.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/model/Definition.kt
index 5d234923..c20e1b4c 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/Definition.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/model/Definition.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql.schema.model
+package com.apurebase.kgraphql.schema.model
 
 /**
  * Unstructured component of KGraphQL schema, intermediate data structure between DSL and SchemaNode
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/Deprecation.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/model/Deprecation.kt
similarity index 55%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/Deprecation.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/model/Deprecation.kt
index f337f88f..3d297c6e 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/Deprecation.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/model/Deprecation.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql.schema.model
+package com.apurebase.kgraphql.schema.model
 
 
 data class Deprecation<T> (val target: T, val reason: String?)
\ No newline at end of file
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/Depreciable.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/model/Depreciable.kt
similarity index 64%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/Depreciable.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/model/Depreciable.kt
index 84080ecb..371a588d 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/Depreciable.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/model/Depreciable.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql.schema.model
+package com.apurebase.kgraphql.schema.model
 
 
 interface Depreciable {
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/DescribedDef.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/model/DescribedDef.kt
similarity index 52%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/DescribedDef.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/model/DescribedDef.kt
index 6371933d..b8126dd0 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/DescribedDef.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/model/DescribedDef.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql.schema.model
+package com.apurebase.kgraphql.schema.model
 
 interface DescribedDef {
     val description : String?
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/EnumValueDef.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/model/EnumValueDef.kt
similarity index 74%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/EnumValueDef.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/model/EnumValueDef.kt
index 28f106fc..94f139d2 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/EnumValueDef.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/model/EnumValueDef.kt
@@ -1,6 +1,6 @@
-package com.github.pgutkowski.kgraphql.schema.model
+package com.apurebase.kgraphql.schema.model
 
-import com.github.pgutkowski.kgraphql.schema.structure2.EnumValue
+import com.apurebase.kgraphql.schema.structure2.EnumValue
 
 
 class EnumValueDef<T : Enum<T>>(
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/FunctionWrapper.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/model/FunctionWrapper.kt
similarity index 98%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/FunctionWrapper.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/model/FunctionWrapper.kt
index c960befc..36596313 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/FunctionWrapper.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/model/FunctionWrapper.kt
@@ -1,9 +1,9 @@
 @file:Suppress("UNCHECKED_CAST")
 
-package com.github.pgutkowski.kgraphql.schema.model
+package com.apurebase.kgraphql.schema.model
 
-import com.github.pgutkowski.kgraphql.schema.SchemaException
-import com.github.pgutkowski.kgraphql.schema.structure2.validateName
+import com.apurebase.kgraphql.schema.SchemaException
+import com.apurebase.kgraphql.schema.structure2.validateName
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlin.reflect.KFunction
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/InputValueDef.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/model/InputValueDef.kt
similarity index 86%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/InputValueDef.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/model/InputValueDef.kt
index 31bebf4e..6cb0abd8 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/InputValueDef.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/model/InputValueDef.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql.schema.model
+package com.apurebase.kgraphql.schema.model
 
 import kotlin.reflect.KClass
 
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/MutableSchemaDefinition.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/model/MutableSchemaDefinition.kt
similarity index 89%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/MutableSchemaDefinition.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/model/MutableSchemaDefinition.kt
index e1b5ef0a..16a749ac 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/MutableSchemaDefinition.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/model/MutableSchemaDefinition.kt
@@ -1,17 +1,17 @@
-package com.github.pgutkowski.kgraphql.schema.model
-
-import com.github.pgutkowski.kgraphql.defaultKQLTypeName
-import com.github.pgutkowski.kgraphql.schema.SchemaException
-import com.github.pgutkowski.kgraphql.schema.builtin.BUILT_IN_TYPE
-import com.github.pgutkowski.kgraphql.schema.directive.Directive
-import com.github.pgutkowski.kgraphql.schema.directive.DirectiveLocation
-import com.github.pgutkowski.kgraphql.schema.dsl.TypeDSL
-import com.github.pgutkowski.kgraphql.schema.introspection.TypeKind
-import com.github.pgutkowski.kgraphql.schema.introspection.__Directive
-import com.github.pgutkowski.kgraphql.schema.introspection.__EnumValue
-import com.github.pgutkowski.kgraphql.schema.introspection.__Field
-import com.github.pgutkowski.kgraphql.schema.introspection.__Schema
-import com.github.pgutkowski.kgraphql.schema.introspection.__Type
+package com.apurebase.kgraphql.schema.model
+
+import com.apurebase.kgraphql.defaultKQLTypeName
+import com.apurebase.kgraphql.schema.SchemaException
+import com.apurebase.kgraphql.schema.builtin.BUILT_IN_TYPE
+import com.apurebase.kgraphql.schema.directive.Directive
+import com.apurebase.kgraphql.schema.directive.DirectiveLocation
+import com.apurebase.kgraphql.schema.dsl.TypeDSL
+import com.apurebase.kgraphql.schema.introspection.TypeKind
+import com.apurebase.kgraphql.schema.introspection.__Directive
+import com.apurebase.kgraphql.schema.introspection.__EnumValue
+import com.apurebase.kgraphql.schema.introspection.__Field
+import com.apurebase.kgraphql.schema.introspection.__Schema
+import com.apurebase.kgraphql.schema.introspection.__Type
 import kotlin.reflect.KClass
 import kotlin.reflect.full.isSubclassOf
 
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/MutationDef.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/model/MutationDef.kt
similarity index 81%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/MutationDef.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/model/MutationDef.kt
index af561f7c..1be14d77 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/MutationDef.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/model/MutationDef.kt
@@ -1,6 +1,6 @@
-package com.github.pgutkowski.kgraphql.schema.model
+package com.apurebase.kgraphql.schema.model
 
-import com.github.pgutkowski.kgraphql.Context
+import com.apurebase.kgraphql.Context
 
 class MutationDef<R> (
         name : String,
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/OperationDef.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/model/OperationDef.kt
similarity index 78%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/OperationDef.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/model/OperationDef.kt
index fb5fee7b..410c7441 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/OperationDef.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/model/OperationDef.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql.schema.model
+package com.apurebase.kgraphql.schema.model
 
 import kotlin.reflect.KType
 
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/PropertyDef.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/model/PropertyDef.kt
similarity index 94%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/PropertyDef.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/model/PropertyDef.kt
index 1814c8f8..91fcd31f 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/PropertyDef.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/model/PropertyDef.kt
@@ -1,6 +1,6 @@
-package com.github.pgutkowski.kgraphql.schema.model
+package com.apurebase.kgraphql.schema.model
 
-import com.github.pgutkowski.kgraphql.Context
+import com.apurebase.kgraphql.Context
 import kotlin.reflect.KProperty1
 
 interface PropertyDef<T> : Depreciable, DescribedDef {
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/QueryDef.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/model/QueryDef.kt
similarity index 82%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/QueryDef.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/model/QueryDef.kt
index 268a006d..e2863614 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/QueryDef.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/model/QueryDef.kt
@@ -1,6 +1,6 @@
-package com.github.pgutkowski.kgraphql.schema.model
+package com.apurebase.kgraphql.schema.model
 
-import com.github.pgutkowski.kgraphql.Context
+import com.apurebase.kgraphql.Context
 
 class QueryDef<R> (
         name : String,
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/SchemaDefinition.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/model/SchemaDefinition.kt
similarity index 85%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/SchemaDefinition.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/model/SchemaDefinition.kt
index 39c894a9..4aeab3f1 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/SchemaDefinition.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/model/SchemaDefinition.kt
@@ -1,6 +1,6 @@
-package com.github.pgutkowski.kgraphql.schema.model
+package com.apurebase.kgraphql.schema.model
 
-import com.github.pgutkowski.kgraphql.schema.directive.Directive
+import com.apurebase.kgraphql.schema.directive.Directive
 
 /**
  * [SchemaDefinition] represents unstructured schema components
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/Transformation.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/model/Transformation.kt
similarity index 79%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/Transformation.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/model/Transformation.kt
index 6ffe33d6..b0faaf80 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/Transformation.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/model/Transformation.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql.schema.model
+package com.apurebase.kgraphql.schema.model
 
 import kotlin.reflect.KProperty1
 
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/TypeDef.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/model/TypeDef.kt
similarity index 92%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/TypeDef.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/model/TypeDef.kt
index 539dcd54..ac254faa 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/model/TypeDef.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/model/TypeDef.kt
@@ -1,7 +1,7 @@
-package com.github.pgutkowski.kgraphql.schema.model
+package com.apurebase.kgraphql.schema.model
 
-import com.github.pgutkowski.kgraphql.schema.scalar.ScalarCoercion
-import com.github.pgutkowski.kgraphql.schema.structure2.Type
+import com.apurebase.kgraphql.schema.scalar.ScalarCoercion
+import com.apurebase.kgraphql.schema.structure2.Type
 import kotlin.reflect.KClass
 import kotlin.reflect.KProperty1
 
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/scalar/BooleanScalarCoercion.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/scalar/BooleanScalarCoercion.kt
similarity index 55%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/scalar/BooleanScalarCoercion.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/scalar/BooleanScalarCoercion.kt
index 855ab75a..eb2e9288 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/scalar/BooleanScalarCoercion.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/scalar/BooleanScalarCoercion.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql.schema.scalar
+package com.apurebase.kgraphql.schema.scalar
 
 
 interface BooleanScalarCoercion <T> : ScalarCoercion<T, Boolean>
\ No newline at end of file
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/scalar/Coercion.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/scalar/Coercion.kt
similarity index 79%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/scalar/Coercion.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/scalar/Coercion.kt
index a17e130d..fe13b8cc 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/scalar/Coercion.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/scalar/Coercion.kt
@@ -1,16 +1,16 @@
-package com.github.pgutkowski.kgraphql.schema.scalar
+package com.apurebase.kgraphql.schema.scalar
 
 import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.node.JsonNodeFactory
-import com.github.pgutkowski.kgraphql.ExecutionException
-import com.github.pgutkowski.kgraphql.RequestException
-import com.github.pgutkowski.kgraphql.schema.builtin.BOOLEAN_COERCION
-import com.github.pgutkowski.kgraphql.schema.builtin.DOUBLE_COERCION
-import com.github.pgutkowski.kgraphql.schema.builtin.FLOAT_COERCION
-import com.github.pgutkowski.kgraphql.schema.builtin.INT_COERCION
-import com.github.pgutkowski.kgraphql.schema.builtin.LONG_COERCION
-import com.github.pgutkowski.kgraphql.schema.builtin.STRING_COERCION
-import com.github.pgutkowski.kgraphql.schema.structure2.Type
+import com.apurebase.kgraphql.ExecutionException
+import com.apurebase.kgraphql.RequestException
+import com.apurebase.kgraphql.schema.builtin.BOOLEAN_COERCION
+import com.apurebase.kgraphql.schema.builtin.DOUBLE_COERCION
+import com.apurebase.kgraphql.schema.builtin.FLOAT_COERCION
+import com.apurebase.kgraphql.schema.builtin.INT_COERCION
+import com.apurebase.kgraphql.schema.builtin.LONG_COERCION
+import com.apurebase.kgraphql.schema.builtin.STRING_COERCION
+import com.apurebase.kgraphql.schema.structure2.Type
 
 @Suppress("UNCHECKED_CAST")
 fun <T : Any> deserializeScalar(scalar: Type.Scalar<T>, value : String): T {
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/scalar/DoubleScalarCoercion.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/scalar/DoubleScalarCoercion.kt
similarity index 54%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/scalar/DoubleScalarCoercion.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/scalar/DoubleScalarCoercion.kt
index 87e26e35..03727908 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/scalar/DoubleScalarCoercion.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/scalar/DoubleScalarCoercion.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql.schema.scalar
+package com.apurebase.kgraphql.schema.scalar
 
 
 interface DoubleScalarCoercion<T> : ScalarCoercion<T, Double>
\ No newline at end of file
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/scalar/IntScalarCoercion.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/scalar/IntScalarCoercion.kt
similarity index 52%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/scalar/IntScalarCoercion.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/scalar/IntScalarCoercion.kt
index 4be9d1c4..e2a5eeaa 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/scalar/IntScalarCoercion.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/scalar/IntScalarCoercion.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql.schema.scalar
+package com.apurebase.kgraphql.schema.scalar
 
 
 interface IntScalarCoercion <T> : ScalarCoercion<T, Int>
\ No newline at end of file
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/scalar/LongScalarCoercion.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/scalar/LongScalarCoercion.kt
similarity index 52%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/scalar/LongScalarCoercion.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/scalar/LongScalarCoercion.kt
index 6da3464c..31cf5f66 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/scalar/LongScalarCoercion.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/scalar/LongScalarCoercion.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql.schema.scalar
+package com.apurebase.kgraphql.schema.scalar
 
 
 interface LongScalarCoercion<T> : ScalarCoercion<T, Long>
\ No newline at end of file
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/scalar/ScalarCoercion.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/scalar/ScalarCoercion.kt
similarity index 88%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/scalar/ScalarCoercion.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/scalar/ScalarCoercion.kt
index b8ed26d1..b848ea4e 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/scalar/ScalarCoercion.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/scalar/ScalarCoercion.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql.schema.scalar
+package com.apurebase.kgraphql.schema.scalar
 
 /**
  * Scalar resolves to a single scalar object, and can't have sub-selections in the request.
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/scalar/StringScalarCoercion.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/scalar/StringScalarCoercion.kt
similarity index 54%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/scalar/StringScalarCoercion.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/scalar/StringScalarCoercion.kt
index 767ab5de..9da32e85 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/scalar/StringScalarCoercion.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/scalar/StringScalarCoercion.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql.schema.scalar
+package com.apurebase.kgraphql.schema.scalar
 
 
 interface StringScalarCoercion<T> : ScalarCoercion<T, String>
\ No newline at end of file
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/structure2/EnumValue.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/structure2/EnumValue.kt
similarity index 65%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/structure2/EnumValue.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/structure2/EnumValue.kt
index 334846a8..d1a255e2 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/structure2/EnumValue.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/structure2/EnumValue.kt
@@ -1,7 +1,7 @@
-package com.github.pgutkowski.kgraphql.schema.structure2
+package com.apurebase.kgraphql.schema.structure2
 
-import com.github.pgutkowski.kgraphql.schema.introspection.__EnumValue
-import com.github.pgutkowski.kgraphql.schema.model.EnumValueDef
+import com.apurebase.kgraphql.schema.introspection.__EnumValue
+import com.apurebase.kgraphql.schema.model.EnumValueDef
 
 
 class EnumValue<T : Enum<T>>(definition:  EnumValueDef<T>) : __EnumValue {
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/structure2/Field.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/structure2/Field.kt
similarity index 79%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/structure2/Field.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/structure2/Field.kt
index 2638d007..38cdf706 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/structure2/Field.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/structure2/Field.kt
@@ -1,14 +1,14 @@
-package com.github.pgutkowski.kgraphql.schema.structure2
-
-import com.github.pgutkowski.kgraphql.Context
-import com.github.pgutkowski.kgraphql.schema.introspection.NotIntrospected
-import com.github.pgutkowski.kgraphql.schema.introspection.__Field
-import com.github.pgutkowski.kgraphql.schema.introspection.__InputValue
-import com.github.pgutkowski.kgraphql.schema.introspection.__Type
-import com.github.pgutkowski.kgraphql.schema.model.BaseOperationDef
-import com.github.pgutkowski.kgraphql.schema.model.FunctionWrapper
-import com.github.pgutkowski.kgraphql.schema.model.PropertyDef
-import com.github.pgutkowski.kgraphql.schema.model.Transformation
+package com.apurebase.kgraphql.schema.structure2
+
+import com.apurebase.kgraphql.Context
+import com.apurebase.kgraphql.schema.introspection.NotIntrospected
+import com.apurebase.kgraphql.schema.introspection.__Field
+import com.apurebase.kgraphql.schema.introspection.__InputValue
+import com.apurebase.kgraphql.schema.introspection.__Type
+import com.apurebase.kgraphql.schema.model.BaseOperationDef
+import com.apurebase.kgraphql.schema.model.FunctionWrapper
+import com.apurebase.kgraphql.schema.model.PropertyDef
+import com.apurebase.kgraphql.schema.model.Transformation
 import kotlin.reflect.full.findAnnotation
 
 
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/structure2/InputValue.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/structure2/InputValue.kt
similarity index 68%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/structure2/InputValue.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/structure2/InputValue.kt
index 18f23d17..eaaf86fa 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/structure2/InputValue.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/structure2/InputValue.kt
@@ -1,7 +1,7 @@
-package com.github.pgutkowski.kgraphql.schema.structure2
+package com.apurebase.kgraphql.schema.structure2
 
-import com.github.pgutkowski.kgraphql.schema.introspection.__InputValue
-import com.github.pgutkowski.kgraphql.schema.model.InputValueDef
+import com.apurebase.kgraphql.schema.introspection.__InputValue
+import com.apurebase.kgraphql.schema.model.InputValueDef
 
 
 class InputValue<T : Any>(
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/structure2/LookupSchema.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/structure2/LookupSchema.kt
similarity index 86%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/structure2/LookupSchema.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/structure2/LookupSchema.kt
index e9a61023..1507b21d 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/structure2/LookupSchema.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/structure2/LookupSchema.kt
@@ -1,9 +1,9 @@
-package com.github.pgutkowski.kgraphql.schema.structure2
+package com.apurebase.kgraphql.schema.structure2
 
-import com.github.pgutkowski.kgraphql.isIterable
-import com.github.pgutkowski.kgraphql.request.TypeReference
-import com.github.pgutkowski.kgraphql.schema.Schema
-import com.github.pgutkowski.kgraphql.schema.introspection.TypeKind
+import com.apurebase.kgraphql.isIterable
+import com.apurebase.kgraphql.request.TypeReference
+import com.apurebase.kgraphql.schema.Schema
+import com.apurebase.kgraphql.schema.introspection.TypeKind
 import kotlin.reflect.KClass
 import kotlin.reflect.KType
 import kotlin.reflect.jvm.jvmErasure
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/structure2/RequestInterpreter.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/structure2/RequestInterpreter.kt
similarity index 88%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/structure2/RequestInterpreter.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/structure2/RequestInterpreter.kt
index 1d3a8902..efa51378 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/structure2/RequestInterpreter.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/structure2/RequestInterpreter.kt
@@ -1,16 +1,16 @@
-package com.github.pgutkowski.kgraphql.schema.structure2
-
-import com.github.pgutkowski.kgraphql.ExecutionException
-import com.github.pgutkowski.kgraphql.RequestException
-import com.github.pgutkowski.kgraphql.request.Operation
-import com.github.pgutkowski.kgraphql.request.OperationVariable
-import com.github.pgutkowski.kgraphql.request.graph.DirectiveInvocation
-import com.github.pgutkowski.kgraphql.request.graph.Fragment
-import com.github.pgutkowski.kgraphql.request.graph.SelectionNode
-import com.github.pgutkowski.kgraphql.schema.directive.Directive
-import com.github.pgutkowski.kgraphql.schema.execution.Execution
-import com.github.pgutkowski.kgraphql.schema.execution.ExecutionPlan
-import com.github.pgutkowski.kgraphql.schema.execution.TypeCondition
+package com.apurebase.kgraphql.schema.structure2
+
+import com.apurebase.kgraphql.ExecutionException
+import com.apurebase.kgraphql.RequestException
+import com.apurebase.kgraphql.request.Operation
+import com.apurebase.kgraphql.request.OperationVariable
+import com.apurebase.kgraphql.request.graph.DirectiveInvocation
+import com.apurebase.kgraphql.request.graph.Fragment
+import com.apurebase.kgraphql.request.graph.SelectionNode
+import com.apurebase.kgraphql.schema.directive.Directive
+import com.apurebase.kgraphql.schema.execution.Execution
+import com.apurebase.kgraphql.schema.execution.ExecutionPlan
+import com.apurebase.kgraphql.schema.execution.TypeCondition
 
 
 class RequestInterpreter(val schemaModel: SchemaModel) {
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/structure2/SchemaCompilation.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/structure2/SchemaCompilation.kt
similarity index 90%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/structure2/SchemaCompilation.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/structure2/SchemaCompilation.kt
index 1d64414b..651ad049 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/structure2/SchemaCompilation.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/structure2/SchemaCompilation.kt
@@ -1,24 +1,24 @@
-package com.github.pgutkowski.kgraphql.schema.structure2
-
-import com.github.pgutkowski.kgraphql.Context
-import com.github.pgutkowski.kgraphql.configuration.SchemaConfiguration
-import com.github.pgutkowski.kgraphql.defaultKQLTypeName
-import com.github.pgutkowski.kgraphql.getIterableElementType
-import com.github.pgutkowski.kgraphql.isIterable
-import com.github.pgutkowski.kgraphql.schema.DefaultSchema
-import com.github.pgutkowski.kgraphql.schema.SchemaException
-import com.github.pgutkowski.kgraphql.schema.directive.Directive
-import com.github.pgutkowski.kgraphql.schema.introspection.SchemaProxy
-import com.github.pgutkowski.kgraphql.schema.introspection.TypeKind
-import com.github.pgutkowski.kgraphql.schema.introspection.__Schema
-import com.github.pgutkowski.kgraphql.schema.model.BaseOperationDef
-import com.github.pgutkowski.kgraphql.schema.model.FunctionWrapper
-import com.github.pgutkowski.kgraphql.schema.model.InputValueDef
-import com.github.pgutkowski.kgraphql.schema.model.PropertyDef
-import com.github.pgutkowski.kgraphql.schema.model.QueryDef
-import com.github.pgutkowski.kgraphql.schema.model.SchemaDefinition
-import com.github.pgutkowski.kgraphql.schema.model.Transformation
-import com.github.pgutkowski.kgraphql.schema.model.TypeDef
+package com.apurebase.kgraphql.schema.structure2
+
+import com.apurebase.kgraphql.Context
+import com.apurebase.kgraphql.configuration.SchemaConfiguration
+import com.apurebase.kgraphql.defaultKQLTypeName
+import com.apurebase.kgraphql.getIterableElementType
+import com.apurebase.kgraphql.isIterable
+import com.apurebase.kgraphql.schema.DefaultSchema
+import com.apurebase.kgraphql.schema.SchemaException
+import com.apurebase.kgraphql.schema.directive.Directive
+import com.apurebase.kgraphql.schema.introspection.SchemaProxy
+import com.apurebase.kgraphql.schema.introspection.TypeKind
+import com.apurebase.kgraphql.schema.introspection.__Schema
+import com.apurebase.kgraphql.schema.model.BaseOperationDef
+import com.apurebase.kgraphql.schema.model.FunctionWrapper
+import com.apurebase.kgraphql.schema.model.InputValueDef
+import com.apurebase.kgraphql.schema.model.PropertyDef
+import com.apurebase.kgraphql.schema.model.QueryDef
+import com.apurebase.kgraphql.schema.model.SchemaDefinition
+import com.apurebase.kgraphql.schema.model.Transformation
+import com.apurebase.kgraphql.schema.model.TypeDef
 import kotlin.reflect.KClass
 import kotlin.reflect.KProperty1
 import kotlin.reflect.KType
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/structure2/SchemaModel.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/structure2/SchemaModel.kt
similarity index 81%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/structure2/SchemaModel.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/structure2/SchemaModel.kt
index dfe30b35..d0748947 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/structure2/SchemaModel.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/structure2/SchemaModel.kt
@@ -1,9 +1,9 @@
-package com.github.pgutkowski.kgraphql.schema.structure2
+package com.apurebase.kgraphql.schema.structure2
 
-import com.github.pgutkowski.kgraphql.schema.directive.Directive
-import com.github.pgutkowski.kgraphql.schema.introspection.NotIntrospected
-import com.github.pgutkowski.kgraphql.schema.introspection.__Schema
-import com.github.pgutkowski.kgraphql.schema.introspection.__Type
+import com.apurebase.kgraphql.schema.directive.Directive
+import com.apurebase.kgraphql.schema.introspection.NotIntrospected
+import com.apurebase.kgraphql.schema.introspection.__Schema
+import com.apurebase.kgraphql.schema.introspection.__Type
 import kotlin.reflect.KClass
 import kotlin.reflect.full.findAnnotation
 
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/structure2/Type.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/structure2/Type.kt
similarity index 93%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/structure2/Type.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/structure2/Type.kt
index 7817778a..78eb99be 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/structure2/Type.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/structure2/Type.kt
@@ -1,13 +1,13 @@
-package com.github.pgutkowski.kgraphql.schema.structure2
-
-import com.github.pgutkowski.kgraphql.Context
-import com.github.pgutkowski.kgraphql.schema.introspection.TypeKind
-import com.github.pgutkowski.kgraphql.schema.introspection.__EnumValue
-import com.github.pgutkowski.kgraphql.schema.introspection.__Field
-import com.github.pgutkowski.kgraphql.schema.introspection.__InputValue
-import com.github.pgutkowski.kgraphql.schema.introspection.__Type
-import com.github.pgutkowski.kgraphql.schema.introspection.asString
-import com.github.pgutkowski.kgraphql.schema.model.TypeDef
+package com.apurebase.kgraphql.schema.structure2
+
+import com.apurebase.kgraphql.Context
+import com.apurebase.kgraphql.schema.introspection.TypeKind
+import com.apurebase.kgraphql.schema.introspection.__EnumValue
+import com.apurebase.kgraphql.schema.introspection.__Field
+import com.apurebase.kgraphql.schema.introspection.__InputValue
+import com.apurebase.kgraphql.schema.introspection.__Type
+import com.apurebase.kgraphql.schema.introspection.asString
+import com.apurebase.kgraphql.schema.model.TypeDef
 import kotlin.reflect.KClass
 import kotlin.reflect.KType
 import kotlin.reflect.KTypeProjection
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/structure2/TypeProxy.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/structure2/TypeProxy.kt
similarity index 70%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/structure2/TypeProxy.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/structure2/TypeProxy.kt
index 464db8f7..bbb594ef 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/structure2/TypeProxy.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/structure2/TypeProxy.kt
@@ -1,10 +1,10 @@
-package com.github.pgutkowski.kgraphql.schema.structure2
+package com.apurebase.kgraphql.schema.structure2
 
-import com.github.pgutkowski.kgraphql.schema.introspection.TypeKind
-import com.github.pgutkowski.kgraphql.schema.introspection.__EnumValue
-import com.github.pgutkowski.kgraphql.schema.introspection.__Field
-import com.github.pgutkowski.kgraphql.schema.introspection.__InputValue
-import com.github.pgutkowski.kgraphql.schema.introspection.__Type
+import com.apurebase.kgraphql.schema.introspection.TypeKind
+import com.apurebase.kgraphql.schema.introspection.__EnumValue
+import com.apurebase.kgraphql.schema.introspection.__Field
+import com.apurebase.kgraphql.schema.introspection.__InputValue
+import com.apurebase.kgraphql.schema.introspection.__Type
 import kotlin.reflect.KClass
 
 open class TypeProxy(var proxied: Type) : Type {
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/structure2/Validation.kt b/src/main/kotlin/com/apurebase/kgraphql/schema/structure2/Validation.kt
similarity index 85%
rename from src/main/kotlin/com/github/pgutkowski/kgraphql/schema/structure2/Validation.kt
rename to src/main/kotlin/com/apurebase/kgraphql/schema/structure2/Validation.kt
index f113f9e8..a7e4c74d 100644
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/structure2/Validation.kt
+++ b/src/main/kotlin/com/apurebase/kgraphql/schema/structure2/Validation.kt
@@ -1,12 +1,12 @@
-package com.github.pgutkowski.kgraphql.schema.structure2
+package com.apurebase.kgraphql.schema.structure2
 
-import com.github.pgutkowski.kgraphql.RequestException
-import com.github.pgutkowski.kgraphql.ValidationException
-import com.github.pgutkowski.kgraphql.request.Arguments
-import com.github.pgutkowski.kgraphql.request.graph.Fragment
-import com.github.pgutkowski.kgraphql.request.graph.SelectionNode
-import com.github.pgutkowski.kgraphql.schema.SchemaException
-import com.github.pgutkowski.kgraphql.schema.introspection.TypeKind
+import com.apurebase.kgraphql.RequestException
+import com.apurebase.kgraphql.ValidationException
+import com.apurebase.kgraphql.request.Arguments
+import com.apurebase.kgraphql.request.graph.Fragment
+import com.apurebase.kgraphql.request.graph.SelectionNode
+import com.apurebase.kgraphql.schema.SchemaException
+import com.apurebase.kgraphql.schema.introspection.TypeKind
 import kotlin.reflect.KClass
 import kotlin.reflect.full.isSubclassOf
 
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/request/graph/DirectiveInvocation.kt b/src/main/kotlin/com/github/pgutkowski/kgraphql/request/graph/DirectiveInvocation.kt
deleted file mode 100644
index 8884d4e8..00000000
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/request/graph/DirectiveInvocation.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.github.pgutkowski.kgraphql.request.graph
-
-import com.github.pgutkowski.kgraphql.request.Arguments
-
-
-data class DirectiveInvocation(val key : String, val arguments: Arguments? = null)
\ No newline at end of file
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/directive/DirectiveExecution.kt b/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/directive/DirectiveExecution.kt
deleted file mode 100644
index f809b283..00000000
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/directive/DirectiveExecution.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.github.pgutkowski.kgraphql.schema.directive
-
-import com.github.pgutkowski.kgraphql.schema.model.FunctionWrapper
-
-
-class DirectiveExecution(val function: FunctionWrapper<DirectiveResult>) : FunctionWrapper<DirectiveResult> by function
\ No newline at end of file
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/SchemaBuilderMarker.kt b/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/SchemaBuilderMarker.kt
deleted file mode 100644
index b6fc52bd..00000000
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/SchemaBuilderMarker.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.github.pgutkowski.kgraphql.schema.dsl
-
-@DslMarker
-annotation class SchemaBuilderMarker
\ No newline at end of file
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/TypeID.kt b/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/TypeID.kt
deleted file mode 100644
index a2c7f3a9..00000000
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/TypeID.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.github.pgutkowski.kgraphql.schema.dsl
-
-
-data class TypeID(val typeID: String)
\ No newline at end of file
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/execution/TypeCondition.kt b/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/execution/TypeCondition.kt
deleted file mode 100644
index 3e03cf09..00000000
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/execution/TypeCondition.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.github.pgutkowski.kgraphql.schema.execution
-
-import com.github.pgutkowski.kgraphql.schema.structure2.Type
-
-/**
- * type conditions can be declared on fragments
- */
-class TypeCondition(val type: Type)
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/introspection/NotIntrospected.kt b/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/introspection/NotIntrospected.kt
deleted file mode 100644
index 6eb24eb4..00000000
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/introspection/NotIntrospected.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.github.pgutkowski.kgraphql.schema.introspection
-
-
-annotation class NotIntrospected
\ No newline at end of file
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/introspection/__Directive.kt b/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/introspection/__Directive.kt
deleted file mode 100644
index d9ab5263..00000000
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/introspection/__Directive.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.github.pgutkowski.kgraphql.schema.introspection
-
-import com.github.pgutkowski.kgraphql.schema.directive.DirectiveLocation
-
-
-interface __Directive : __Described {
-
-    val locations : List<DirectiveLocation>
-
-    val args: List<__InputValue>
-}
\ No newline at end of file
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/introspection/__EnumValue.kt b/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/introspection/__EnumValue.kt
deleted file mode 100644
index 50f6d5d8..00000000
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/introspection/__EnumValue.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.github.pgutkowski.kgraphql.schema.introspection
-
-import com.github.pgutkowski.kgraphql.schema.model.Depreciable
-
-
-interface __EnumValue: Depreciable, __Described
\ No newline at end of file
diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/introspection/__Field.kt b/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/introspection/__Field.kt
deleted file mode 100644
index 39cc8286..00000000
--- a/src/main/kotlin/com/github/pgutkowski/kgraphql/schema/introspection/__Field.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.github.pgutkowski.kgraphql.schema.introspection
-
-import com.github.pgutkowski.kgraphql.schema.model.Depreciable
-
-
-interface __Field : Depreciable, __Described {
-
-    val type: __Type
-
-    val args: List<__InputValue>
-}
\ No newline at end of file
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/Specification.kt b/src/test/kotlin/com/apurebase/kgraphql/Specification.kt
similarity index 76%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/Specification.kt
rename to src/test/kotlin/com/apurebase/kgraphql/Specification.kt
index e915671d..b575eb2e 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/Specification.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/Specification.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql
+package com.apurebase.kgraphql
 
 /**
  * Denotes test for specific part of GraphQL specification
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/TestClasses.kt b/src/test/kotlin/com/apurebase/kgraphql/TestClasses.kt
similarity index 77%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/TestClasses.kt
rename to src/test/kotlin/com/apurebase/kgraphql/TestClasses.kt
index d4e37e66..f5a124e9 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/TestClasses.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/TestClasses.kt
@@ -1,6 +1,6 @@
-package com.github.pgutkowski.kgraphql
+package com.apurebase.kgraphql
 
-import com.github.pgutkowski.kgraphql.schema.scalar.StringScalarCoercion
+import com.apurebase.kgraphql.schema.scalar.StringScalarCoercion
 
 
 class Film(val id : Id, val year: Int, val title: String, val director: Director, val type: FilmType = FilmType.FULL_LENGTH)
@@ -9,6 +9,9 @@ abstract class Person(val name: String, val age: Int)
 
 class Director(name : String, age: Int, val favActors: List<Actor>) : Person(name, age)
 
+class ActorInput(val name: String, val age: Int)
+class ActorCalculateAgeInput(val name: String, val ages: List<Int>)
+
 class Actor(name : String, age: Int) : Person(name, age)
 
 class Id(val literal: String, val numeric: Int)
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/TestUtils.kt b/src/test/kotlin/com/apurebase/kgraphql/TestUtils.kt
similarity index 83%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/TestUtils.kt
rename to src/test/kotlin/com/apurebase/kgraphql/TestUtils.kt
index e4478fca..d9c38e23 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/TestUtils.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/TestUtils.kt
@@ -1,9 +1,9 @@
-package com.github.pgutkowski.kgraphql
+package com.apurebase.kgraphql
 
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import com.github.pgutkowski.kgraphql.schema.DefaultSchema
-import com.github.pgutkowski.kgraphql.schema.Schema
-import com.github.pgutkowski.kgraphql.schema.dsl.SchemaBuilder
+import com.apurebase.kgraphql.schema.DefaultSchema
+import com.apurebase.kgraphql.schema.Schema
+import com.apurebase.kgraphql.schema.dsl.SchemaBuilder
 import org.hamcrest.CoreMatchers
 import org.hamcrest.FeatureMatcher
 import org.hamcrest.MatcherAssert
@@ -25,15 +25,15 @@ fun getMap(map : Map<*,*>, key : String) : Map<*,*>{
 fun <T> Map<*, *>.extract(path: String) : T {
     val tokens = path.trim().split('/').filter(String::isNotBlank)
     try {
-        return tokens.fold(this as Any?, { workingMap, token ->
+        return tokens.fold(this as Any?) { workingMap, token ->
             if(token.contains('[')){
                 val list = (workingMap as Map<*,*>)[token.substringBefore('[')]
-                val index = token[token.indexOf('[')+1].toString().toInt()
+                val index = token.substring(token.indexOf('[')+1, token.length -1).toInt()
                 (list as List<*>)[index]
             } else {
                 (workingMap as Map<*,*>)[token]
             }
-        }) as T
+        } as T
     } catch (e : Exception){
         throw IllegalArgumentException("Path: $path does not exist in map: ${this}", e)
     }
@@ -61,8 +61,8 @@ fun assertError(map : Map<*,*>, vararg messageElements : String) {
     MatcherAssert.assertThat(errorMessage, CoreMatchers.notNullValue())
 
     messageElements
-            .filterNot { errorMessage.contains(it) }
-            .forEach { throw AssertionError("Expected error message to contain $it, but was: $errorMessage") }
+        .filterNot { errorMessage.contains(it) }
+        .forEach { throw AssertionError("Expected error message to contain $it, but was: $errorMessage") }
 }
 
 inline fun <reified T: Exception> expect(message: String? = null, block: () -> Unit){
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/access/AccessRulesTest.kt b/src/test/kotlin/com/apurebase/kgraphql/access/AccessRulesTest.kt
similarity index 54%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/access/AccessRulesTest.kt
rename to src/test/kotlin/com/apurebase/kgraphql/access/AccessRulesTest.kt
index 918204f5..d1a24064 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/access/AccessRulesTest.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/access/AccessRulesTest.kt
@@ -1,10 +1,6 @@
-package com.github.pgutkowski.kgraphql.access
+package com.apurebase.kgraphql.access
 
-import com.github.pgutkowski.kgraphql.context
-import com.github.pgutkowski.kgraphql.defaultSchema
-import com.github.pgutkowski.kgraphql.deserialize
-import com.github.pgutkowski.kgraphql.expect
-import com.github.pgutkowski.kgraphql.extract
+import com.apurebase.kgraphql.*
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
@@ -24,10 +20,15 @@ class AccessRulesTest {
         }
 
         type<Player>{
+            val accessRuleBlock = { player: Player, _: Context ->
+                if (player.name != "BONNER") IllegalAccessException("ILLEGAL ACCESS") else null
+            }
             property(Player::id){
-                accessRule { player, _ ->
-                    if(player.name != "BONNER") IllegalAccessException("ILLEGAL ACCESS") else null
-                }
+                accessRule(accessRuleBlock)
+            }
+            property<String>("item") {
+                accessRule(accessRuleBlock)
+                resolver { "item" }
             }
         }
     }
@@ -44,13 +45,28 @@ class AccessRulesTest {
 
     @Test
     fun `reject when not matching`(){
-        expect<IllegalAccessException> {
+        expect<IllegalAccessException>("") {
             deserialize (
                     schema.execute("{ black_mamba {id} }", context { +"LAKERS" })
             ).extract<String>("data/black_mamba/id")
         }
     }
 
+    @Test
+    fun `allow property resolver access rule`() {
+        assertThat(
+            deserialize(schema.execute("{white_mamba {item}}")).extract<String>("data/white_mamba/item"),
+            equalTo("item")
+        )
+    }
+
+    @Test
+    fun `reject property resolver access rule`() {
+        expect<IllegalAccessException>("ILLEGAL ACCESS") {
+            schema.execute("{black_mamba {item}}", context { +"LAKERS" })
+        }
+    }
+
     //TODO: MORE TESTS
 
 }
\ No newline at end of file
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/demo/HelloWorld.kt b/src/test/kotlin/com/apurebase/kgraphql/demo/HelloWorld.kt
similarity index 75%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/demo/HelloWorld.kt
rename to src/test/kotlin/com/apurebase/kgraphql/demo/HelloWorld.kt
index 7673533b..88368450 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/demo/HelloWorld.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/demo/HelloWorld.kt
@@ -1,6 +1,6 @@
-package com.github.pgutkowski.kgraphql.demo
+package com.apurebase.kgraphql.demo
 
-import com.github.pgutkowski.kgraphql.KGraphQL
+import com.apurebase.kgraphql.KGraphQL
 
 fun main(args : Array<String>) {
     val schema = KGraphQL.schema {
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/demo/ServerDemo.kt b/src/test/kotlin/com/apurebase/kgraphql/demo/ServerDemo.kt
similarity index 55%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/demo/ServerDemo.kt
rename to src/test/kotlin/com/apurebase/kgraphql/demo/ServerDemo.kt
index 242befba..2afae409 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/demo/ServerDemo.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/demo/ServerDemo.kt
@@ -1,7 +1,7 @@
-package com.github.pgutkowski.kgraphql.demo
+package com.apurebase.kgraphql.demo
 
-import com.github.pgutkowski.kgraphql.integration.QueryTest
-import com.github.pgutkowski.kgraphql.server.NettyServer
+import com.apurebase.kgraphql.integration.QueryTest
+import com.apurebase.kgraphql.server.NettyServer
 
 /**
  * Demo application showing of tested schema, by default runs on localhost:8080
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/demo/StarWarsSchema.kt b/src/test/kotlin/com/apurebase/kgraphql/demo/StarWarsSchema.kt
similarity index 95%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/demo/StarWarsSchema.kt
rename to src/test/kotlin/com/apurebase/kgraphql/demo/StarWarsSchema.kt
index c77d364d..79ada001 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/demo/StarWarsSchema.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/demo/StarWarsSchema.kt
@@ -1,8 +1,8 @@
-package com.github.pgutkowski.kgraphql.demo
+package com.apurebase.kgraphql.demo
 
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.fasterxml.jackson.module.kotlin.registerKotlinModule
-import com.github.pgutkowski.kgraphql.KGraphQL
+import com.apurebase.kgraphql.KGraphQL
 
 enum class Episode {
     NEWHOPE, EMPIRE, JEDI
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/integration/BaseSchemaTest.kt b/src/test/kotlin/com/apurebase/kgraphql/integration/BaseSchemaTest.kt
similarity index 88%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/integration/BaseSchemaTest.kt
rename to src/test/kotlin/com/apurebase/kgraphql/integration/BaseSchemaTest.kt
index 8a6075c6..67f8db26 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/integration/BaseSchemaTest.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/integration/BaseSchemaTest.kt
@@ -1,17 +1,6 @@
-package com.github.pgutkowski.kgraphql.integration
-
-import com.github.pgutkowski.kgraphql.Actor
-import com.github.pgutkowski.kgraphql.Director
-import com.github.pgutkowski.kgraphql.Film
-import com.github.pgutkowski.kgraphql.FilmType
-import com.github.pgutkowski.kgraphql.Id
-import com.github.pgutkowski.kgraphql.IdScalarSupport
-import com.github.pgutkowski.kgraphql.Person
-import com.github.pgutkowski.kgraphql.Scenario
-import com.github.pgutkowski.kgraphql.defaultSchema
-import com.github.pgutkowski.kgraphql.deserialize
-import com.github.pgutkowski.kgraphql.schema.DefaultSchema
-import com.github.pgutkowski.kgraphql.schema.dsl.SchemaBuilder
+package com.apurebase.kgraphql.integration
+
+import com.apurebase.kgraphql.*
 import org.junit.After
 
 
@@ -184,6 +173,30 @@ abstract class BaseSchemaTest {
                 actor
             }
         }
+        mutation("createActorWithInput") {
+            description = "create new actor"
+            resolver { input: ActorInput ->
+                val actor = Actor(input.name, input.age)
+                createdActors.add(actor)
+                actor
+            }
+        }
+        mutation("createActorWithAges") {
+            description = "create new actor"
+            resolver { name: String, ages: List<Int> ->
+                val actor = Actor(name, ages.reduce { sum, age -> sum + age })
+                createdActors.add(actor)
+                actor
+            }
+        }
+        mutation("createActorWithAgesInput") {
+            description = "create new actor"
+            resolver { input: ActorCalculateAgeInput ->
+                val actor = Actor(input.name, input.ages.reduce { sum, age -> sum + age })
+                createdActors.add(actor)
+                actor
+            }
+        }
         query("scenario") {
             resolver { -> Scenario(Id("GKalus", 234234), "Gamil Kalus", "Very long scenario") }
         }
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/integration/EnumTest.kt b/src/test/kotlin/com/apurebase/kgraphql/integration/EnumTest.kt
similarity index 83%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/integration/EnumTest.kt
rename to src/test/kotlin/com/apurebase/kgraphql/integration/EnumTest.kt
index 3b6fd3a6..160c9108 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/integration/EnumTest.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/integration/EnumTest.kt
@@ -1,7 +1,7 @@
-package com.github.pgutkowski.kgraphql.integration
+package com.apurebase.kgraphql.integration
 
-import com.github.pgutkowski.kgraphql.assertNoErrors
-import com.github.pgutkowski.kgraphql.extract
+import com.apurebase.kgraphql.assertNoErrors
+import com.apurebase.kgraphql.extract
 import org.hamcrest.CoreMatchers
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/integration/LongScalarTest.kt b/src/test/kotlin/com/apurebase/kgraphql/integration/LongScalarTest.kt
similarity index 81%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/integration/LongScalarTest.kt
rename to src/test/kotlin/com/apurebase/kgraphql/integration/LongScalarTest.kt
index f653ff50..70c42066 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/integration/LongScalarTest.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/integration/LongScalarTest.kt
@@ -1,10 +1,10 @@
-package com.github.pgutkowski.kgraphql.integration
+package com.apurebase.kgraphql.integration
 
-import com.github.pgutkowski.kgraphql.KGraphQL
-import com.github.pgutkowski.kgraphql.defaultSchema
-import com.github.pgutkowski.kgraphql.deserialize
-import com.github.pgutkowski.kgraphql.extract
-import com.github.pgutkowski.kgraphql.specification.typesystem.ScalarsSpecificationTest
+import com.apurebase.kgraphql.KGraphQL
+import com.apurebase.kgraphql.defaultSchema
+import com.apurebase.kgraphql.deserialize
+import com.apurebase.kgraphql.extract
+import com.apurebase.kgraphql.specification.typesystem.ScalarsSpecificationTest
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/integration/MutationTest.kt b/src/test/kotlin/com/apurebase/kgraphql/integration/MutationTest.kt
similarity index 89%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/integration/MutationTest.kt
rename to src/test/kotlin/com/apurebase/kgraphql/integration/MutationTest.kt
index 44326bee..70ec9b99 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/integration/MutationTest.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/integration/MutationTest.kt
@@ -1,10 +1,10 @@
-package com.github.pgutkowski.kgraphql.integration
+package com.apurebase.kgraphql.integration
 
-import com.github.pgutkowski.kgraphql.Actor
-import com.github.pgutkowski.kgraphql.RequestException
-import com.github.pgutkowski.kgraphql.assertNoErrors
-import com.github.pgutkowski.kgraphql.expect
-import com.github.pgutkowski.kgraphql.extract
+import com.apurebase.kgraphql.Actor
+import com.apurebase.kgraphql.RequestException
+import com.apurebase.kgraphql.assertNoErrors
+import com.apurebase.kgraphql.expect
+import com.apurebase.kgraphql.extract
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/integration/ParallelExecutionTest.kt b/src/test/kotlin/com/apurebase/kgraphql/integration/ParallelExecutionTest.kt
similarity index 51%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/integration/ParallelExecutionTest.kt
rename to src/test/kotlin/com/apurebase/kgraphql/integration/ParallelExecutionTest.kt
index dd265aa3..f9220520 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/integration/ParallelExecutionTest.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/integration/ParallelExecutionTest.kt
@@ -1,38 +1,70 @@
-package com.github.pgutkowski.kgraphql.integration
+package com.apurebase.kgraphql.integration
 
-import com.github.pgutkowski.kgraphql.KGraphQL
-import com.github.pgutkowski.kgraphql.assertNoErrors
-import com.github.pgutkowski.kgraphql.extract
-import com.github.pgutkowski.kgraphql.deserialize
+import com.apurebase.kgraphql.KGraphQL
+import com.apurebase.kgraphql.extract
+import com.apurebase.kgraphql.deserialize
 import kotlinx.coroutines.delay
 import org.hamcrest.CoreMatchers
 import org.hamcrest.MatcherAssert
 import org.junit.Test
+import kotlin.random.Random
 
 class ParallelExecutionTest {
 
-    val syncResolversSchema = KGraphQL.schema {
+    data class AType(val id: Int)
+
+    private val syncResolversSchema = KGraphQL.schema {
         repeat(1000) {
-            query("automated-${it}") {
+            query("automated-$it") {
                 resolver { ->
                     Thread.sleep(3)
-                    "${it}"
+                    "$it"
                 }
             }
         }
     }
 
-    val suspendResolverSchema = KGraphQL.schema {
+    private val suspendResolverSchema = KGraphQL.schema {
         repeat(1000) {
-            query("automated-${it}") {
+            query("automated-$it") {
                 suspendResolver { ->
                     delay(3)
-                    "${it}"
+                    "$it"
+                }
+            }
+        }
+    }
+
+    private val suspendPropertySchema = KGraphQL.schema {
+        query("getAll") {
+            resolver { -> (0..999).map { AType(it) } }
+        }
+        type<AType> {
+            property<List<AType>>("children") {
+                suspendResolver { parent ->
+                    (0..50).map {
+                        delay(Random.nextLong(1, 100))
+                        AType((parent.id * 10) + it)
+                    }
                 }
             }
         }
     }
 
+    @Test
+    fun `Suspendable property resolvers`() {
+        val query = "{getAll{id,children{id}}}"
+        val map = deserialize(suspendPropertySchema.execute(query))
+
+        MatcherAssert.assertThat(map.extract<Int>("data/getAll[0]/id"), CoreMatchers.equalTo(0))
+        MatcherAssert.assertThat(map.extract<Int>("data/getAll[500]/id"), CoreMatchers.equalTo(500))
+        MatcherAssert.assertThat(map.extract<Int>("data/getAll[766]/id"), CoreMatchers.equalTo(766))
+
+        MatcherAssert.assertThat(map.extract<Int>("data/getAll[5]/children[5]/id"), CoreMatchers.equalTo(55))
+        MatcherAssert.assertThat(map.extract<Int>("data/getAll[75]/children[9]/id"), CoreMatchers.equalTo(759))
+        MatcherAssert.assertThat(map.extract<Int>("data/getAll[888]/children[50]/id"), CoreMatchers.equalTo(8930))
+    }
+
     val query = "{ " + (0..999).map { "automated-${it}" }.joinToString(", ") + " }"
 
     @Test
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/integration/QueryTest.kt b/src/test/kotlin/com/apurebase/kgraphql/integration/QueryTest.kt
similarity index 95%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/integration/QueryTest.kt
rename to src/test/kotlin/com/apurebase/kgraphql/integration/QueryTest.kt
index 19589ffa..faffdc28 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/integration/QueryTest.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/integration/QueryTest.kt
@@ -1,10 +1,10 @@
-package com.github.pgutkowski.kgraphql.integration
+package com.apurebase.kgraphql.integration
 
-import com.github.pgutkowski.kgraphql.RequestException
-import com.github.pgutkowski.kgraphql.ValidationException
-import com.github.pgutkowski.kgraphql.assertNoErrors
-import com.github.pgutkowski.kgraphql.expect
-import com.github.pgutkowski.kgraphql.extract
+import com.apurebase.kgraphql.RequestException
+import com.apurebase.kgraphql.ValidationException
+import com.apurebase.kgraphql.assertNoErrors
+import com.apurebase.kgraphql.expect
+import com.apurebase.kgraphql.extract
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/request/DocumentParserTest.kt b/src/test/kotlin/com/apurebase/kgraphql/request/DocumentParserTest.kt
similarity index 92%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/request/DocumentParserTest.kt
rename to src/test/kotlin/com/apurebase/kgraphql/request/DocumentParserTest.kt
index 212924c0..2264da72 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/request/DocumentParserTest.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/request/DocumentParserTest.kt
@@ -1,14 +1,14 @@
-package com.github.pgutkowski.kgraphql.request
-
-import com.github.pgutkowski.kgraphql.request.graph.SelectionTree
-import com.github.pgutkowski.kgraphql.request.graph.argBranch
-import com.github.pgutkowski.kgraphql.request.graph.argLeaf
-import com.github.pgutkowski.kgraphql.request.graph.args
-import com.github.pgutkowski.kgraphql.request.graph.branch
-import com.github.pgutkowski.kgraphql.request.graph.extFragment
-import com.github.pgutkowski.kgraphql.request.graph.inlineFragment
-import com.github.pgutkowski.kgraphql.request.graph.leaf
-import com.github.pgutkowski.kgraphql.request.graph.leafs
+package com.apurebase.kgraphql.request
+
+import com.apurebase.kgraphql.request.graph.SelectionTree
+import com.apurebase.kgraphql.request.graph.argBranch
+import com.apurebase.kgraphql.request.graph.argLeaf
+import com.apurebase.kgraphql.request.graph.args
+import com.apurebase.kgraphql.request.graph.branch
+import com.apurebase.kgraphql.request.graph.extFragment
+import com.apurebase.kgraphql.request.graph.inlineFragment
+import com.apurebase.kgraphql.request.graph.leaf
+import com.apurebase.kgraphql.request.graph.leafs
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
diff --git a/src/test/kotlin/com/apurebase/kgraphql/request/RequestTokenizationTest.kt b/src/test/kotlin/com/apurebase/kgraphql/request/RequestTokenizationTest.kt
new file mode 100644
index 00000000..80e34058
--- /dev/null
+++ b/src/test/kotlin/com/apurebase/kgraphql/request/RequestTokenizationTest.kt
@@ -0,0 +1,106 @@
+package com.apurebase.kgraphql.request
+
+import org.hamcrest.CoreMatchers.equalTo
+import org.hamcrest.MatcherAssert.assertThat
+import org.junit.Test
+
+/**
+ * Not lots of tests, as tokenization is mostly covered by Query and Mutation tests
+ */
+class RequestTokenizationTest {
+
+    private fun testTokenization(input : String, expected : List<String>) {
+        val tokens = tokenizeRequest(input)
+        assertThat(tokens, equalTo(expected))
+    }
+
+    @Test
+    fun `tokenize mutation with args`(){
+        testTokenization(
+            input = "{createHero(name: \"Batman\", appearsIn: \"The Dark Knight\")}",
+            expected = listOf("{", "createHero", "(", "name", ":", "\"Batman\"", "appearsIn", ":", "\"The Dark Knight\"", ")", "}")
+        )
+    }
+
+    @Test
+    fun `tokenize simple query`(){
+        testTokenization(
+            input = "{batman: hero(name: \"Batman\"){ skills : powers }}",
+            expected = listOf("{", "batman", ":", "hero", "(", "name", ":", "\"Batman\"", ")", "{", "skills", ":", "powers", "}", "}")
+        )
+    }
+
+    @Test
+    fun `tokenize query with nested selection set`(){
+        testTokenization(
+            input = "{hero{name appearsIn{title{abbr full} year}}\nvillain{name deeds}}",
+            expected = listOf(
+                "{", "hero", "{", "name", "appearsIn", "{", "title", "{", "abbr", "full", "}", "year", "}", "}",
+                "villain", "{", "name", "deeds", "}", "}"
+            )
+        )
+    }
+
+    @Test
+    fun `Tokenize list argument`(){
+        testTokenization(
+            input = "{List(value : [23, 3, 23])}",
+            expected = listOf(
+                "{", "List","(", "value", ":", "[", "23", "3", "23", "]", ")","}"
+            )
+        )
+    }
+
+    @Test
+    fun `Tokenize required list argument`() {
+        val d = "$"
+        testTokenization(
+            input = "mutation create(${d}agesName1: String!, ${d}ages: [String!]!){ createActorWithAges(name: ${d}agesName1, ages: ${d}ages1) { name, age } }",
+            expected = listOf(
+                "mutation",
+                "create",
+                "(",
+                "${d}agesName1",
+                ":",
+                "String!",
+                "${d}ages",
+                ":",
+                "[",
+                "String!",
+                "]!",
+                ")",
+                "{",
+                "createActorWithAges",
+                "(",
+                "name",
+                ":",
+                "${d}agesName1",
+                "ages",
+                ":",
+                "${d}ages1",
+                ")",
+                "{",
+                "name",
+                "age",
+                "}",
+                "}"
+            )
+        )
+    }
+
+    @Test
+    fun `tokenize input with quotes`(){
+        testTokenization(
+            input = "{hello(name : \"Ted\\\" Mosby\")}",
+            expected = listOf("{", "hello", "(", "name", ":", "\"Ted\\\" Mosby\"", ")", "}")
+        )
+    }
+
+    @Test
+    fun `tokenize input with new lines`() {
+        testTokenization(
+            input = "{lists{\r\ntotalCount\r\nnodes{\r\ntitle\r\n }\r\n}\r\n}",
+            expected = listOf("{", "lists", "{", "totalCount", "nodes", "{", "title", "}", "}", "}")
+        )
+    }
+}
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/schema/SchemaBuilderTest.kt b/src/test/kotlin/com/apurebase/kgraphql/schema/SchemaBuilderTest.kt
similarity index 95%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/schema/SchemaBuilderTest.kt
rename to src/test/kotlin/com/apurebase/kgraphql/schema/SchemaBuilderTest.kt
index b2b0a89f..085a6c51 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/schema/SchemaBuilderTest.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/schema/SchemaBuilderTest.kt
@@ -1,19 +1,19 @@
-package com.github.pgutkowski.kgraphql.schema
-
-import com.github.pgutkowski.kgraphql.Actor
-import com.github.pgutkowski.kgraphql.Context
-import com.github.pgutkowski.kgraphql.FilmType
-import com.github.pgutkowski.kgraphql.Id
-import com.github.pgutkowski.kgraphql.KGraphQL
-import com.github.pgutkowski.kgraphql.Scenario
-import com.github.pgutkowski.kgraphql.context
-import com.github.pgutkowski.kgraphql.defaultSchema
-import com.github.pgutkowski.kgraphql.deserialize
-import com.github.pgutkowski.kgraphql.expect
-import com.github.pgutkowski.kgraphql.extract
-import com.github.pgutkowski.kgraphql.schema.introspection.TypeKind
-import com.github.pgutkowski.kgraphql.schema.scalar.StringScalarCoercion
-import com.github.pgutkowski.kgraphql.schema.structure2.Field
+package com.apurebase.kgraphql.schema
+
+import com.apurebase.kgraphql.Actor
+import com.apurebase.kgraphql.Context
+import com.apurebase.kgraphql.FilmType
+import com.apurebase.kgraphql.Id
+import com.apurebase.kgraphql.KGraphQL
+import com.apurebase.kgraphql.Scenario
+import com.apurebase.kgraphql.context
+import com.apurebase.kgraphql.defaultSchema
+import com.apurebase.kgraphql.deserialize
+import com.apurebase.kgraphql.expect
+import com.apurebase.kgraphql.extract
+import com.apurebase.kgraphql.schema.introspection.TypeKind
+import com.apurebase.kgraphql.schema.scalar.StringScalarCoercion
+import com.apurebase.kgraphql.schema.structure2.Field
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import org.hamcrest.CoreMatchers
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/schema/SchemaInheritanceTest.kt b/src/test/kotlin/com/apurebase/kgraphql/schema/SchemaInheritanceTest.kt
similarity index 80%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/schema/SchemaInheritanceTest.kt
rename to src/test/kotlin/com/apurebase/kgraphql/schema/SchemaInheritanceTest.kt
index 64bb0993..23454333 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/schema/SchemaInheritanceTest.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/schema/SchemaInheritanceTest.kt
@@ -1,9 +1,9 @@
-package com.github.pgutkowski.kgraphql.schema
+package com.apurebase.kgraphql.schema
 
-import com.github.pgutkowski.kgraphql.KGraphQL
-import com.github.pgutkowski.kgraphql.RequestException
-import com.github.pgutkowski.kgraphql.deserialize
-import com.github.pgutkowski.kgraphql.expect
+import com.apurebase.kgraphql.KGraphQL
+import com.apurebase.kgraphql.RequestException
+import com.apurebase.kgraphql.deserialize
+import com.apurebase.kgraphql.expect
 import org.junit.Test
 import java.util.*
 
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/server/HttpRequestHandler.kt b/src/test/kotlin/com/apurebase/kgraphql/server/HttpRequestHandler.kt
similarity index 96%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/server/HttpRequestHandler.kt
rename to src/test/kotlin/com/apurebase/kgraphql/server/HttpRequestHandler.kt
index 3d61c886..2b615fca 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/server/HttpRequestHandler.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/server/HttpRequestHandler.kt
@@ -1,7 +1,7 @@
-package com.github.pgutkowski.kgraphql.server
+package com.apurebase.kgraphql.server
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import com.github.pgutkowski.kgraphql.schema.DefaultSchema
+import com.apurebase.kgraphql.schema.DefaultSchema
 import io.netty.buffer.Unpooled
 import io.netty.channel.ChannelFutureListener
 import io.netty.channel.ChannelHandler
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/server/NettyServer.kt b/src/test/kotlin/com/apurebase/kgraphql/server/NettyServer.kt
similarity index 89%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/server/NettyServer.kt
rename to src/test/kotlin/com/apurebase/kgraphql/server/NettyServer.kt
index 768cc7cd..364e5440 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/server/NettyServer.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/server/NettyServer.kt
@@ -1,7 +1,7 @@
-package com.github.pgutkowski.kgraphql.server
+package com.apurebase.kgraphql.server
 
-import com.github.pgutkowski.kgraphql.schema.DefaultSchema
-import com.github.pgutkowski.kgraphql.schema.Schema
+import com.apurebase.kgraphql.schema.DefaultSchema
+import com.apurebase.kgraphql.schema.Schema
 import io.netty.bootstrap.ServerBootstrap
 import io.netty.buffer.PooledByteBufAllocator
 import io.netty.channel.ChannelOption
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/server/NettyServerPipelineConfig.kt b/src/test/kotlin/com/apurebase/kgraphql/server/NettyServerPipelineConfig.kt
similarity index 94%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/server/NettyServerPipelineConfig.kt
rename to src/test/kotlin/com/apurebase/kgraphql/server/NettyServerPipelineConfig.kt
index 95030f5c..1e0acde8 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/server/NettyServerPipelineConfig.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/server/NettyServerPipelineConfig.kt
@@ -1,4 +1,4 @@
-package com.github.pgutkowski.kgraphql.server
+package com.apurebase.kgraphql.server
 
 import io.netty.channel.ChannelInitializer
 import io.netty.channel.socket.SocketChannel
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/introspection/ContextSpecificationTest.kt b/src/test/kotlin/com/apurebase/kgraphql/specification/introspection/ContextSpecificationTest.kt
similarity index 80%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/specification/introspection/ContextSpecificationTest.kt
rename to src/test/kotlin/com/apurebase/kgraphql/specification/introspection/ContextSpecificationTest.kt
index 8c4aa3e0..7c3a85c7 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/introspection/ContextSpecificationTest.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/specification/introspection/ContextSpecificationTest.kt
@@ -1,9 +1,9 @@
-package com.github.pgutkowski.kgraphql.specification.introspection
+package com.apurebase.kgraphql.specification.introspection
 
-import com.github.pgutkowski.kgraphql.Context
-import com.github.pgutkowski.kgraphql.defaultSchema
-import com.github.pgutkowski.kgraphql.deserialize
-import com.github.pgutkowski.kgraphql.extract
+import com.apurebase.kgraphql.Context
+import com.apurebase.kgraphql.defaultSchema
+import com.apurebase.kgraphql.deserialize
+import com.apurebase.kgraphql.extract
 import org.hamcrest.CoreMatchers
 import org.hamcrest.MatcherAssert
 import org.junit.Test
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/introspection/DeprecationSpecificationTest.kt b/src/test/kotlin/com/apurebase/kgraphql/specification/introspection/DeprecationSpecificationTest.kt
similarity index 95%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/specification/introspection/DeprecationSpecificationTest.kt
rename to src/test/kotlin/com/apurebase/kgraphql/specification/introspection/DeprecationSpecificationTest.kt
index b02b38fc..5f3601ea 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/introspection/DeprecationSpecificationTest.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/specification/introspection/DeprecationSpecificationTest.kt
@@ -1,8 +1,8 @@
-package com.github.pgutkowski.kgraphql.specification.introspection
+package com.apurebase.kgraphql.specification.introspection
 
-import com.github.pgutkowski.kgraphql.defaultSchema
-import com.github.pgutkowski.kgraphql.deserialize
-import com.github.pgutkowski.kgraphql.extract
+import com.apurebase.kgraphql.defaultSchema
+import com.apurebase.kgraphql.deserialize
+import com.apurebase.kgraphql.extract
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/introspection/DocumentationSpecificationTest.kt b/src/test/kotlin/com/apurebase/kgraphql/specification/introspection/DocumentationSpecificationTest.kt
similarity index 95%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/specification/introspection/DocumentationSpecificationTest.kt
rename to src/test/kotlin/com/apurebase/kgraphql/specification/introspection/DocumentationSpecificationTest.kt
index 44c4b8e4..9f16f88d 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/introspection/DocumentationSpecificationTest.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/specification/introspection/DocumentationSpecificationTest.kt
@@ -1,8 +1,8 @@
-package com.github.pgutkowski.kgraphql.specification.introspection
+package com.apurebase.kgraphql.specification.introspection
 
-import com.github.pgutkowski.kgraphql.defaultSchema
-import com.github.pgutkowski.kgraphql.deserialize
-import com.github.pgutkowski.kgraphql.extract
+import com.apurebase.kgraphql.defaultSchema
+import com.apurebase.kgraphql.deserialize
+import com.apurebase.kgraphql.extract
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/introspection/IntrospectionSpecificationTest.kt b/src/test/kotlin/com/apurebase/kgraphql/specification/introspection/IntrospectionSpecificationTest.kt
similarity index 95%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/specification/introspection/IntrospectionSpecificationTest.kt
rename to src/test/kotlin/com/apurebase/kgraphql/specification/introspection/IntrospectionSpecificationTest.kt
index 02420b5c..9e892c95 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/introspection/IntrospectionSpecificationTest.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/specification/introspection/IntrospectionSpecificationTest.kt
@@ -1,13 +1,13 @@
-package com.github.pgutkowski.kgraphql.specification.introspection
-
-import com.github.pgutkowski.kgraphql.RequestException
-import com.github.pgutkowski.kgraphql.defaultSchema
-import com.github.pgutkowski.kgraphql.deserialize
-import com.github.pgutkowski.kgraphql.expect
-import com.github.pgutkowski.kgraphql.extract
-import com.github.pgutkowski.kgraphql.integration.BaseSchemaTest
-import com.github.pgutkowski.kgraphql.schema.Schema
-import com.github.pgutkowski.kgraphql.schema.introspection.TypeKind
+package com.apurebase.kgraphql.specification.introspection
+
+import com.apurebase.kgraphql.RequestException
+import com.apurebase.kgraphql.defaultSchema
+import com.apurebase.kgraphql.deserialize
+import com.apurebase.kgraphql.expect
+import com.apurebase.kgraphql.extract
+import com.apurebase.kgraphql.integration.BaseSchemaTest
+import com.apurebase.kgraphql.schema.Schema
+import com.apurebase.kgraphql.schema.introspection.TypeKind
 import junit.framework.Assert.fail
 import org.hamcrest.CoreMatchers
 import org.hamcrest.CoreMatchers.anyOf
diff --git a/src/test/kotlin/com/apurebase/kgraphql/specification/language/ArgumentsSpecificationTest.kt b/src/test/kotlin/com/apurebase/kgraphql/specification/language/ArgumentsSpecificationTest.kt
new file mode 100644
index 00000000..6842a422
--- /dev/null
+++ b/src/test/kotlin/com/apurebase/kgraphql/specification/language/ArgumentsSpecificationTest.kt
@@ -0,0 +1,104 @@
+package com.apurebase.kgraphql.specification.language
+
+import com.apurebase.kgraphql.Actor
+import com.apurebase.kgraphql.Specification
+import com.apurebase.kgraphql.defaultSchema
+import com.apurebase.kgraphql.deserialize
+import com.apurebase.kgraphql.executeEqualQueries
+import org.hamcrest.CoreMatchers.equalTo
+import org.hamcrest.MatcherAssert.assertThat
+import org.junit.Test
+
+@Specification("2.6 Arguments")
+class ArgumentsSpecificationTest {
+    val age = 432
+
+    val schema = defaultSchema {
+        query("actor") {
+            resolver { -> Actor("Boguś Linda", age) }
+        }
+
+        type<Actor>{
+            property<List<String>>("favDishes") {
+                resolver { _: Actor, size: Int, prefix: String? ->
+                    listOf("steak", "burger", "soup", "salad", "bread", "bird").let { dishes ->
+                        if(prefix != null){
+                            dishes.filter { it.startsWith(prefix) }
+                        } else {
+                            dishes
+                        }
+                    }.take(size)
+                }
+            }
+            property<Int>("none") {
+                suspendResolver { actor -> actor.age }
+            }
+            property<Int>("one") {
+                suspendResolver {actor, one: Int -> actor.age + one }
+            }
+            property<Int>("two") {
+                suspendResolver { actor, one: Int, two: Int -> actor.age + one + two }
+            }
+            property<Int>("three") {
+                suspendResolver { actor, one: Int, two: Int, three: Int ->
+                    actor.age + one + two + three
+                }
+            }
+            property<Int>("four") {
+                suspendResolver { actor, one: Int, two: Int, three: Int, four: Int ->
+                    actor.age + one + two + three + four
+                }
+            }
+            property<Int>("five") {
+                suspendResolver { actor, one: Int, two: Int, three: Int, four: Int, five: Int ->
+                    actor.age + one + two + three + four + five
+                }
+            }
+        }
+    }
+
+    @Test
+    fun `arguments are unordered`(){
+        executeEqualQueries( schema,
+                mapOf("data" to mapOf("actor" to mapOf("favDishes" to listOf("burger", "bread")))),
+                "{actor{favDishes(size: 2, prefix: \"b\")}}",
+                "{actor{favDishes(prefix: \"b\", size: 2)}}"
+        )
+    }
+
+    @Test
+    fun `many arguments can exist on given field`(){
+        val response = deserialize(schema.execute("{actor{favDishes(size: 2, prefix: \"b\")}}")) as Map<String, Any>
+        assertThat (
+                response, equalTo(mapOf<String, Any>("data" to mapOf("actor" to mapOf("favDishes" to listOf("burger", "bread")))))
+        )
+    }
+
+    @Test
+    fun `all arguments to suspendResolvers`() {
+        val request = """
+            {
+                actor {
+                    none
+                    one(one: 1)
+                    two(one: 2, two: 3)
+                    three(one: 4, two: 5, three: 6)
+                    four(one: 7, two: 8, three: 9, four: 10)
+                    five(one: 11, two: 12, three: 13, four: 14, five: 15)
+                }
+            }
+        """.trimIndent()
+        val response = deserialize(schema.execute(request)) as Map<String, Any>
+        assertThat(response, equalTo(mapOf<String, Any>(
+            "data" to mapOf("actor" to mapOf(
+                "none" to age,
+                "one" to age + 1,
+                "two" to age + 2 + 3,
+                "three" to age + 4 + 5 + 6,
+                "four" to age + 7 + 8 + 9 + 10,
+                "five" to age + 11 + 12 + 13 + 14 + 15
+            ))
+        )))
+    }
+
+}
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/language/FieldAliasSpecificationTest.kt b/src/test/kotlin/com/apurebase/kgraphql/specification/language/FieldAliasSpecificationTest.kt
similarity index 78%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/specification/language/FieldAliasSpecificationTest.kt
rename to src/test/kotlin/com/apurebase/kgraphql/specification/language/FieldAliasSpecificationTest.kt
index 616b145b..2e1a4222 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/language/FieldAliasSpecificationTest.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/specification/language/FieldAliasSpecificationTest.kt
@@ -1,10 +1,10 @@
-package com.github.pgutkowski.kgraphql.specification.language
+package com.apurebase.kgraphql.specification.language
 
-import com.github.pgutkowski.kgraphql.Actor
-import com.github.pgutkowski.kgraphql.Specification
-import com.github.pgutkowski.kgraphql.defaultSchema
-import com.github.pgutkowski.kgraphql.deserialize
-import com.github.pgutkowski.kgraphql.extract
+import com.apurebase.kgraphql.Actor
+import com.apurebase.kgraphql.Specification
+import com.apurebase.kgraphql.defaultSchema
+import com.apurebase.kgraphql.deserialize
+import com.apurebase.kgraphql.extract
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/language/FieldsSpecificationTest.kt b/src/test/kotlin/com/apurebase/kgraphql/specification/language/FieldsSpecificationTest.kt
similarity index 70%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/specification/language/FieldsSpecificationTest.kt
rename to src/test/kotlin/com/apurebase/kgraphql/specification/language/FieldsSpecificationTest.kt
index 25cdcf21..957ed22d 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/language/FieldsSpecificationTest.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/specification/language/FieldsSpecificationTest.kt
@@ -1,10 +1,10 @@
-package com.github.pgutkowski.kgraphql.specification.language
+package com.apurebase.kgraphql.specification.language
 
-import com.github.pgutkowski.kgraphql.Actor
-import com.github.pgutkowski.kgraphql.Specification
-import com.github.pgutkowski.kgraphql.defaultSchema
-import com.github.pgutkowski.kgraphql.deserialize
-import com.github.pgutkowski.kgraphql.extract
+import com.apurebase.kgraphql.Actor
+import com.apurebase.kgraphql.Specification
+import com.apurebase.kgraphql.defaultSchema
+import com.apurebase.kgraphql.deserialize
+import com.apurebase.kgraphql.extract
 import org.hamcrest.CoreMatchers
 import org.hamcrest.MatcherAssert
 import org.junit.Test
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/language/FragmentsSpecificationTest.kt b/src/test/kotlin/com/apurebase/kgraphql/specification/language/FragmentsSpecificationTest.kt
similarity index 88%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/specification/language/FragmentsSpecificationTest.kt
rename to src/test/kotlin/com/apurebase/kgraphql/specification/language/FragmentsSpecificationTest.kt
index d63b8f88..ecfea0cf 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/language/FragmentsSpecificationTest.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/specification/language/FragmentsSpecificationTest.kt
@@ -1,17 +1,17 @@
-package com.github.pgutkowski.kgraphql.specification.language
-
-import com.github.pgutkowski.kgraphql.Actor
-import com.github.pgutkowski.kgraphql.RequestException
-import com.github.pgutkowski.kgraphql.Specification
-import com.github.pgutkowski.kgraphql.assertNoErrors
-import com.github.pgutkowski.kgraphql.defaultSchema
-import com.github.pgutkowski.kgraphql.deserialize
-import com.github.pgutkowski.kgraphql.executeEqualQueries
-import com.github.pgutkowski.kgraphql.expect
-import com.github.pgutkowski.kgraphql.extract
-import com.github.pgutkowski.kgraphql.extractOrNull
-import com.github.pgutkowski.kgraphql.integration.BaseSchemaTest
-import com.github.pgutkowski.kgraphql.integration.BaseSchemaTest.Companion.INTROSPECTION_QUERY
+package com.apurebase.kgraphql.specification.language
+
+import com.apurebase.kgraphql.Actor
+import com.apurebase.kgraphql.RequestException
+import com.apurebase.kgraphql.Specification
+import com.apurebase.kgraphql.assertNoErrors
+import com.apurebase.kgraphql.defaultSchema
+import com.apurebase.kgraphql.deserialize
+import com.apurebase.kgraphql.executeEqualQueries
+import com.apurebase.kgraphql.expect
+import com.apurebase.kgraphql.extract
+import com.apurebase.kgraphql.extractOrNull
+import com.apurebase.kgraphql.integration.BaseSchemaTest
+import com.apurebase.kgraphql.integration.BaseSchemaTest.Companion.INTROSPECTION_QUERY
 import org.hamcrest.CoreMatchers
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.CoreMatchers.not
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/language/InputValuesSpecificationTest.kt b/src/test/kotlin/com/apurebase/kgraphql/specification/language/InputValuesSpecificationTest.kt
similarity index 94%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/specification/language/InputValuesSpecificationTest.kt
rename to src/test/kotlin/com/apurebase/kgraphql/specification/language/InputValuesSpecificationTest.kt
index 5e5b21d1..1f805bd6 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/language/InputValuesSpecificationTest.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/specification/language/InputValuesSpecificationTest.kt
@@ -1,11 +1,11 @@
-package com.github.pgutkowski.kgraphql.specification.language
-
-import com.github.pgutkowski.kgraphql.RequestException
-import com.github.pgutkowski.kgraphql.Specification
-import com.github.pgutkowski.kgraphql.defaultSchema
-import com.github.pgutkowski.kgraphql.deserialize
-import com.github.pgutkowski.kgraphql.expect
-import com.github.pgutkowski.kgraphql.extract
+package com.apurebase.kgraphql.specification.language
+
+import com.apurebase.kgraphql.RequestException
+import com.apurebase.kgraphql.Specification
+import com.apurebase.kgraphql.defaultSchema
+import com.apurebase.kgraphql.deserialize
+import com.apurebase.kgraphql.expect
+import com.apurebase.kgraphql.extract
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Ignore
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/language/OperationsSpecificationTest.kt b/src/test/kotlin/com/apurebase/kgraphql/specification/language/OperationsSpecificationTest.kt
similarity index 81%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/specification/language/OperationsSpecificationTest.kt
rename to src/test/kotlin/com/apurebase/kgraphql/specification/language/OperationsSpecificationTest.kt
index d557ba8c..ec90c88f 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/language/OperationsSpecificationTest.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/specification/language/OperationsSpecificationTest.kt
@@ -1,9 +1,9 @@
-package com.github.pgutkowski.kgraphql.specification.language
+package com.apurebase.kgraphql.specification.language
 
-import com.github.pgutkowski.kgraphql.Actor
-import com.github.pgutkowski.kgraphql.Specification
-import com.github.pgutkowski.kgraphql.defaultSchema
-import com.github.pgutkowski.kgraphql.executeEqualQueries
+import com.apurebase.kgraphql.Actor
+import com.apurebase.kgraphql.Specification
+import com.apurebase.kgraphql.defaultSchema
+import com.apurebase.kgraphql.executeEqualQueries
 import junit.framework.Assert.fail
 import org.junit.Ignore
 import org.junit.Test
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/language/QueryDocumentSpecificationTest.kt b/src/test/kotlin/com/apurebase/kgraphql/specification/language/QueryDocumentSpecificationTest.kt
similarity index 74%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/specification/language/QueryDocumentSpecificationTest.kt
rename to src/test/kotlin/com/apurebase/kgraphql/specification/language/QueryDocumentSpecificationTest.kt
index 5af86178..4cce8128 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/language/QueryDocumentSpecificationTest.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/specification/language/QueryDocumentSpecificationTest.kt
@@ -1,13 +1,13 @@
-package com.github.pgutkowski.kgraphql.specification.language
+package com.apurebase.kgraphql.specification.language
 
-import com.github.pgutkowski.kgraphql.Actor
-import com.github.pgutkowski.kgraphql.RequestException
-import com.github.pgutkowski.kgraphql.Specification
-import com.github.pgutkowski.kgraphql.assertNoErrors
-import com.github.pgutkowski.kgraphql.defaultSchema
-import com.github.pgutkowski.kgraphql.deserialize
-import com.github.pgutkowski.kgraphql.expect
-import com.github.pgutkowski.kgraphql.extract
+import com.apurebase.kgraphql.Actor
+import com.apurebase.kgraphql.RequestException
+import com.apurebase.kgraphql.Specification
+import com.apurebase.kgraphql.assertNoErrors
+import com.apurebase.kgraphql.defaultSchema
+import com.apurebase.kgraphql.deserialize
+import com.apurebase.kgraphql.expect
+import com.apurebase.kgraphql.extract
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/language/SelectionSetsSpecificationTest.kt b/src/test/kotlin/com/apurebase/kgraphql/specification/language/SelectionSetsSpecificationTest.kt
similarity index 79%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/specification/language/SelectionSetsSpecificationTest.kt
rename to src/test/kotlin/com/apurebase/kgraphql/specification/language/SelectionSetsSpecificationTest.kt
index 5124b30e..cfeb9e47 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/language/SelectionSetsSpecificationTest.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/specification/language/SelectionSetsSpecificationTest.kt
@@ -1,10 +1,10 @@
-package com.github.pgutkowski.kgraphql.specification.language
+package com.apurebase.kgraphql.specification.language
 
-import com.github.pgutkowski.kgraphql.Actor
-import com.github.pgutkowski.kgraphql.Specification
-import com.github.pgutkowski.kgraphql.defaultSchema
-import com.github.pgutkowski.kgraphql.deserialize
-import com.github.pgutkowski.kgraphql.extract
+import com.apurebase.kgraphql.Actor
+import com.apurebase.kgraphql.Specification
+import com.apurebase.kgraphql.defaultSchema
+import com.apurebase.kgraphql.deserialize
+import com.apurebase.kgraphql.extract
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/language/SourceTextSpecificationTest.kt b/src/test/kotlin/com/apurebase/kgraphql/specification/language/SourceTextSpecificationTest.kt
similarity index 86%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/specification/language/SourceTextSpecificationTest.kt
rename to src/test/kotlin/com/apurebase/kgraphql/specification/language/SourceTextSpecificationTest.kt
index 2a58fcdc..fb9efcae 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/language/SourceTextSpecificationTest.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/specification/language/SourceTextSpecificationTest.kt
@@ -1,14 +1,14 @@
-package com.github.pgutkowski.kgraphql.specification.language
+package com.apurebase.kgraphql.specification.language
 
-import com.github.pgutkowski.kgraphql.Actor
-import com.github.pgutkowski.kgraphql.RequestException
-import com.github.pgutkowski.kgraphql.Specification
-import com.github.pgutkowski.kgraphql.assertNoErrors
-import com.github.pgutkowski.kgraphql.defaultSchema
-import com.github.pgutkowski.kgraphql.deserialize
-import com.github.pgutkowski.kgraphql.executeEqualQueries
-import com.github.pgutkowski.kgraphql.expect
-import com.github.pgutkowski.kgraphql.extract
+import com.apurebase.kgraphql.Actor
+import com.apurebase.kgraphql.RequestException
+import com.apurebase.kgraphql.Specification
+import com.apurebase.kgraphql.assertNoErrors
+import com.apurebase.kgraphql.defaultSchema
+import com.apurebase.kgraphql.deserialize
+import com.apurebase.kgraphql.executeEqualQueries
+import com.apurebase.kgraphql.expect
+import com.apurebase.kgraphql.extract
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
diff --git a/src/test/kotlin/com/apurebase/kgraphql/specification/language/VariablesSpecificationTest.kt b/src/test/kotlin/com/apurebase/kgraphql/specification/language/VariablesSpecificationTest.kt
new file mode 100644
index 00000000..c19482cc
--- /dev/null
+++ b/src/test/kotlin/com/apurebase/kgraphql/specification/language/VariablesSpecificationTest.kt
@@ -0,0 +1,182 @@
+package com.apurebase.kgraphql.specification.language
+
+import com.apurebase.kgraphql.Specification
+import com.apurebase.kgraphql.assertNoErrors
+import com.apurebase.kgraphql.expect
+import com.apurebase.kgraphql.extract
+import com.apurebase.kgraphql.integration.BaseSchemaTest
+import org.hamcrest.CoreMatchers.equalTo
+import org.hamcrest.MatcherAssert.assertThat
+import org.junit.Test
+
+@Specification("2.10 Variables")
+class VariablesSpecificationTest : BaseSchemaTest() {
+    @Test
+    fun `query with variables`(){
+        val map = execute(
+                query = "mutation(\$name: String!, \$age : Int!) {createActor(name: \$name, age: \$age){name, age}}",
+                variables = "{\"name\":\"Boguś Linda\", \"age\": 22}"
+        )
+        assertNoErrors(map)
+        assertThat(
+                map.extract<Map<String, Any>>("data/createActor"),
+                equalTo(mapOf("name" to "Boguś Linda", "age" to 22))
+        )
+    }
+
+    @Test
+    fun `query with boolean variable`(){
+        val map = execute(query = "query(\$big: Boolean!) {number(big: \$big)}", variables = "{\"big\": true}")
+        assertNoErrors(map)
+        assertThat(map.extract<Int>("data/number"), equalTo(10000))
+    }
+
+    @Test
+    fun `query with boolean variable default value`(){
+        val map = execute(query = "query(\$big: Boolean = true) {number(big: \$big)}")
+        assertNoErrors(map)
+        assertThat(map.extract<Int>("data/number"), equalTo(10000))
+    }
+
+    @Test
+    fun `query with variables and string default value`(){
+        val map = execute(
+                query = "mutation(\$name: String = \"Boguś Linda\", \$age : Int!) {createActor(name: \$name, age: \$age){name, age}}",
+                variables = "{\"age\": 22}"
+        )
+        assertNoErrors(map)
+        assertThat(
+                map.extract<Map<String, Any>>("data/createActor"),
+                equalTo(mapOf("name" to "Boguś Linda", "age" to 22))
+        )
+    }
+
+    @Test
+    fun `query with variables and default value pointing to another variable`(){
+        val map = execute(
+                query = "mutation(\$name: String = \"Boguś Linda\", \$age : Int = \$defaultAge, \$defaultAge : Int!) " +
+                        "{createActor(name: \$name, age: \$age){name, age}}",
+                variables = "{\"defaultAge\": 22}"
+        )
+        assertNoErrors(map)
+        assertThat(
+                map.extract<Map<String, Any>>("data/createActor"),
+                equalTo(mapOf("name" to "Boguś Linda", "age" to 22))
+        )
+    }
+
+    @Test
+    fun `fragment with variable`(){
+        val map = execute(
+                query = "mutation(\$name: String = \"Boguś Linda\", \$age : Int!, \$big: Boolean!) {createActor(name: \$name, age: \$age){...Linda}}" +
+                        "fragment Linda on Actor {picture(big: \$big)}",
+                variables = "{\"age\": 22, \"big\": true}"
+        )
+        assertNoErrors(map)
+        assertThat(
+                map.extract<String>("data/createActor/picture"),
+                equalTo("http://picture.server/pic/Boguś_Linda?big=true")
+        )
+    }
+
+    @Test
+    fun `fragment with missing variable`(){
+        expect<IllegalArgumentException>("Variable '\$big' was not declared for this operation"){
+            execute(
+                    query = "mutation(\$name: String = \"Boguś Linda\", \$age : Int!) {createActor(name: \$name, age: \$age){...Linda}}" +
+                            "fragment Linda on Actor {picture(big: \$big)}",
+                    variables = "{\"age\": 22}"
+            )
+        }
+    }
+
+    @Test
+    fun `Advanced variables`() {
+        val d = "$"
+        val request = """
+            mutation MultipleCreate(
+                ${d}name1: String!,
+                ${d}age1: Int!,
+                ${d}name2: String!,
+                ${d}age2: Int!,
+                ${d}input1: ActorInput!,
+                ${d}input2: ActorInput!,
+                ${d}agesName1: String!,
+                ${d}ages1: [Int!]!,
+                ${d}agesName2: String!,
+                ${d}ages2: [Int!]!,
+                ${d}agesInput1: ActorCalculateAgeInput!,
+                ${d}agesInput2: ActorCalculateAgeInput!
+            ) {
+                createFirst: createActor(name: ${d}name1, age: ${d}age1) { name, age }
+                createSecond: createActor(name: ${d}name2, age: ${d}age2) { name, age }
+                inputFirst: createActorWithInput(input: ${d}input1) { name, age }
+                inputSecond: createActorWithInput(input: ${d}input2) { name, age }
+                agesFirst: createActorWithAges(name: ${d}agesName1, ages: ${d}ages1) { name, age }
+                agesSecond: createActorWithAges(name: ${d}agesName2, ages: ${d}ages2) { name, age }
+                inputAgesFirst: createActorWithAgesInput(input: ${d}agesInput1) { name, age }
+                inputAgesSecond: createActorWithAgesInput(input: ${d}agesInput2) { name, age }
+            }
+        """.trimEnd()
+        val variables = """
+            {
+                "name1": "Jógvan",
+                "age1": 1,
+                "name2": "Paweł",
+                "age2": 2,
+                "input1": {"name": "Olsen", "age": 3},
+                "input2": {"name": "Gutkowski", "age": 4},
+                "agesName1": "Someone",
+                "ages1": [10,50],
+                "agesName2": "Some other",
+                "ages2": [5, 10],
+                "agesInput1": {"name": "Jógvan Olsen", "ages": [3]},
+                "agesInput2": {"name": "Paweł Gutkowski", "ages": [4,5,6,7]}
+            }
+        """.trimIndent()
+
+        val result = execute(request, variables)
+
+
+        assertNoErrors(result)
+        assertThat(result.extract("data/createFirst/name"), equalTo("Jógvan"))
+        assertThat(result.extract("data/createSecond/age"), equalTo(2))
+        assertThat(result.extract("data/inputFirst/name"), equalTo("Olsen"))
+        assertThat(result.extract("data/inputSecond/age"), equalTo(4))
+        assertThat(result.extract("data/agesFirst/name"), equalTo("Someone"))
+        assertThat(result.extract("data/agesSecond/age"), equalTo(15))
+        assertThat(result.extract("data/inputAgesFirst/name"), equalTo("Jógvan Olsen"))
+        assertThat(result.extract("data/inputAgesSecond/age"), equalTo(22))
+    }
+
+    @Test
+    fun `required variable arrays`() {
+        val d = "$"
+        val request = """
+            mutation MultipleCreate(
+                ${d}agesName1: String!,
+                ${d}ages1: [Int!]!,
+                ${d}agesName2: String!,
+                ${d}ages2: [Int!]!
+            ) {
+                agesFirst: createActorWithAges(name: ${d}agesName1, ages: ${d}ages1) { name, age }
+                agesSecond: createActorWithAges(name: ${d}agesName2, ages: ${d}ages2) { name, age }
+            }
+        """.trimIndent()
+        val variables = """
+            {
+                "agesName1": "Someone",
+                "ages1": [10,50],
+                "agesName2": "Some other",
+                "ages2": [5, 10]
+            }
+        """.trimIndent()
+
+        val result = execute(request, variables)
+
+
+        assertNoErrors(result)
+        assertThat(result.extract("data/agesFirst/name"), equalTo("Someone"))
+        assertThat(result.extract("data/agesSecond/age"), equalTo(15))
+    }
+}
\ No newline at end of file
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/typesystem/DirectivesSpecificationTest.kt b/src/test/kotlin/com/apurebase/kgraphql/specification/typesystem/DirectivesSpecificationTest.kt
similarity index 88%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/specification/typesystem/DirectivesSpecificationTest.kt
rename to src/test/kotlin/com/apurebase/kgraphql/specification/typesystem/DirectivesSpecificationTest.kt
index 54f57a81..622eda5f 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/typesystem/DirectivesSpecificationTest.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/specification/typesystem/DirectivesSpecificationTest.kt
@@ -1,8 +1,8 @@
-package com.github.pgutkowski.kgraphql.specification.typesystem
+package com.apurebase.kgraphql.specification.typesystem
 
-import com.github.pgutkowski.kgraphql.Specification
-import com.github.pgutkowski.kgraphql.extractOrNull
-import com.github.pgutkowski.kgraphql.integration.BaseSchemaTest
+import com.apurebase.kgraphql.Specification
+import com.apurebase.kgraphql.extractOrNull
+import com.apurebase.kgraphql.integration.BaseSchemaTest
 import org.hamcrest.CoreMatchers.notNullValue
 import org.hamcrest.CoreMatchers.nullValue
 import org.hamcrest.MatcherAssert.assertThat
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/typesystem/EnumsSpecificationTest.kt b/src/test/kotlin/com/apurebase/kgraphql/specification/typesystem/EnumsSpecificationTest.kt
similarity index 74%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/specification/typesystem/EnumsSpecificationTest.kt
rename to src/test/kotlin/com/apurebase/kgraphql/specification/typesystem/EnumsSpecificationTest.kt
index 2abe8b12..b5614fc6 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/typesystem/EnumsSpecificationTest.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/specification/typesystem/EnumsSpecificationTest.kt
@@ -1,11 +1,11 @@
-package com.github.pgutkowski.kgraphql.specification.typesystem
-
-import com.github.pgutkowski.kgraphql.KGraphQL
-import com.github.pgutkowski.kgraphql.RequestException
-import com.github.pgutkowski.kgraphql.Specification
-import com.github.pgutkowski.kgraphql.deserialize
-import com.github.pgutkowski.kgraphql.expect
-import com.github.pgutkowski.kgraphql.extract
+package com.apurebase.kgraphql.specification.typesystem
+
+import com.apurebase.kgraphql.KGraphQL
+import com.apurebase.kgraphql.RequestException
+import com.apurebase.kgraphql.Specification
+import com.apurebase.kgraphql.deserialize
+import com.apurebase.kgraphql.expect
+import com.apurebase.kgraphql.extract
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/typesystem/InputObjectsSpecificationTest.kt b/src/test/kotlin/com/apurebase/kgraphql/specification/typesystem/InputObjectsSpecificationTest.kt
similarity index 91%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/specification/typesystem/InputObjectsSpecificationTest.kt
rename to src/test/kotlin/com/apurebase/kgraphql/specification/typesystem/InputObjectsSpecificationTest.kt
index 0dba7cea..537af50e 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/typesystem/InputObjectsSpecificationTest.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/specification/typesystem/InputObjectsSpecificationTest.kt
@@ -1,9 +1,9 @@
-package com.github.pgutkowski.kgraphql.specification.typesystem
+package com.apurebase.kgraphql.specification.typesystem
 
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import com.github.pgutkowski.kgraphql.KGraphQL
-import com.github.pgutkowski.kgraphql.deserialize
-import com.github.pgutkowski.kgraphql.extract
+import com.apurebase.kgraphql.KGraphQL
+import com.apurebase.kgraphql.deserialize
+import com.apurebase.kgraphql.extract
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.CoreMatchers.nullValue
 import org.hamcrest.CoreMatchers.startsWith
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/typesystem/InterfacesSpecificationTest.kt b/src/test/kotlin/com/apurebase/kgraphql/specification/typesystem/InterfacesSpecificationTest.kt
similarity index 77%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/specification/typesystem/InterfacesSpecificationTest.kt
rename to src/test/kotlin/com/apurebase/kgraphql/specification/typesystem/InterfacesSpecificationTest.kt
index 32b3964c..c4febcff 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/typesystem/InterfacesSpecificationTest.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/specification/typesystem/InterfacesSpecificationTest.kt
@@ -1,11 +1,11 @@
-package com.github.pgutkowski.kgraphql.specification.typesystem
+package com.apurebase.kgraphql.specification.typesystem
 
-import com.github.pgutkowski.kgraphql.KGraphQL
-import com.github.pgutkowski.kgraphql.RequestException
-import com.github.pgutkowski.kgraphql.Specification
-import com.github.pgutkowski.kgraphql.deserialize
-import com.github.pgutkowski.kgraphql.expect
-import com.github.pgutkowski.kgraphql.extract
+import com.apurebase.kgraphql.KGraphQL
+import com.apurebase.kgraphql.RequestException
+import com.apurebase.kgraphql.Specification
+import com.apurebase.kgraphql.deserialize
+import com.apurebase.kgraphql.expect
+import com.apurebase.kgraphql.extract
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/typesystem/ListsSpecificationTest.kt b/src/test/kotlin/com/apurebase/kgraphql/specification/typesystem/ListsSpecificationTest.kt
similarity index 92%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/specification/typesystem/ListsSpecificationTest.kt
rename to src/test/kotlin/com/apurebase/kgraphql/specification/typesystem/ListsSpecificationTest.kt
index 71440b8a..fb8e055b 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/typesystem/ListsSpecificationTest.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/specification/typesystem/ListsSpecificationTest.kt
@@ -1,12 +1,12 @@
-package com.github.pgutkowski.kgraphql.specification.typesystem
+package com.apurebase.kgraphql.specification.typesystem
 
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import com.github.pgutkowski.kgraphql.KGraphQL
-import com.github.pgutkowski.kgraphql.RequestException
-import com.github.pgutkowski.kgraphql.Specification
-import com.github.pgutkowski.kgraphql.deserialize
-import com.github.pgutkowski.kgraphql.expect
-import com.github.pgutkowski.kgraphql.extract
+import com.apurebase.kgraphql.KGraphQL
+import com.apurebase.kgraphql.RequestException
+import com.apurebase.kgraphql.Specification
+import com.apurebase.kgraphql.deserialize
+import com.apurebase.kgraphql.expect
+import com.apurebase.kgraphql.extract
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.CoreMatchers.notNullValue
 import org.hamcrest.CoreMatchers.nullValue
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/typesystem/NonNullSpecificationTest.kt b/src/test/kotlin/com/apurebase/kgraphql/specification/typesystem/NonNullSpecificationTest.kt
similarity index 82%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/specification/typesystem/NonNullSpecificationTest.kt
rename to src/test/kotlin/com/apurebase/kgraphql/specification/typesystem/NonNullSpecificationTest.kt
index 1c9f4170..43ca7808 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/typesystem/NonNullSpecificationTest.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/specification/typesystem/NonNullSpecificationTest.kt
@@ -1,11 +1,11 @@
-package com.github.pgutkowski.kgraphql.specification.typesystem
+package com.apurebase.kgraphql.specification.typesystem
 
-import com.github.pgutkowski.kgraphql.KGraphQL
-import com.github.pgutkowski.kgraphql.RequestException
-import com.github.pgutkowski.kgraphql.Specification
-import com.github.pgutkowski.kgraphql.deserialize
-import com.github.pgutkowski.kgraphql.expect
-import com.github.pgutkowski.kgraphql.extract
+import com.apurebase.kgraphql.KGraphQL
+import com.apurebase.kgraphql.RequestException
+import com.apurebase.kgraphql.Specification
+import com.apurebase.kgraphql.deserialize
+import com.apurebase.kgraphql.expect
+import com.apurebase.kgraphql.extract
 import org.hamcrest.CoreMatchers.nullValue
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/typesystem/ObjectsSpecificationTest.kt b/src/test/kotlin/com/apurebase/kgraphql/specification/typesystem/ObjectsSpecificationTest.kt
similarity index 96%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/specification/typesystem/ObjectsSpecificationTest.kt
rename to src/test/kotlin/com/apurebase/kgraphql/specification/typesystem/ObjectsSpecificationTest.kt
index ff33c0c9..1041551b 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/typesystem/ObjectsSpecificationTest.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/specification/typesystem/ObjectsSpecificationTest.kt
@@ -1,10 +1,10 @@
-package com.github.pgutkowski.kgraphql.specification.typesystem
+package com.apurebase.kgraphql.specification.typesystem
 
-import com.github.pgutkowski.kgraphql.Actor
-import com.github.pgutkowski.kgraphql.KGraphQL
-import com.github.pgutkowski.kgraphql.Specification
-import com.github.pgutkowski.kgraphql.expect
-import com.github.pgutkowski.kgraphql.schema.SchemaException
+import com.apurebase.kgraphql.Actor
+import com.apurebase.kgraphql.KGraphQL
+import com.apurebase.kgraphql.Specification
+import com.apurebase.kgraphql.expect
+import com.apurebase.kgraphql.schema.SchemaException
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.hamcrest.Matchers.greaterThan
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/typesystem/ScalarsSpecificationTest.kt b/src/test/kotlin/com/apurebase/kgraphql/specification/typesystem/ScalarsSpecificationTest.kt
similarity index 95%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/specification/typesystem/ScalarsSpecificationTest.kt
rename to src/test/kotlin/com/apurebase/kgraphql/specification/typesystem/ScalarsSpecificationTest.kt
index 110ed0af..691ab51c 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/typesystem/ScalarsSpecificationTest.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/specification/typesystem/ScalarsSpecificationTest.kt
@@ -1,12 +1,12 @@
-package com.github.pgutkowski.kgraphql.specification.typesystem
-
-import com.github.pgutkowski.kgraphql.KGraphQL
-import com.github.pgutkowski.kgraphql.RequestException
-import com.github.pgutkowski.kgraphql.Specification
-import com.github.pgutkowski.kgraphql.deserialize
-import com.github.pgutkowski.kgraphql.expect
-import com.github.pgutkowski.kgraphql.extract
-import com.github.pgutkowski.kgraphql.schema.scalar.StringScalarCoercion
+package com.apurebase.kgraphql.specification.typesystem
+
+import com.apurebase.kgraphql.KGraphQL
+import com.apurebase.kgraphql.RequestException
+import com.apurebase.kgraphql.Specification
+import com.apurebase.kgraphql.deserialize
+import com.apurebase.kgraphql.expect
+import com.apurebase.kgraphql.extract
+import com.apurebase.kgraphql.schema.scalar.StringScalarCoercion
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/typesystem/TypeSystemSpecificationTest.kt b/src/test/kotlin/com/apurebase/kgraphql/specification/typesystem/TypeSystemSpecificationTest.kt
similarity index 71%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/specification/typesystem/TypeSystemSpecificationTest.kt
rename to src/test/kotlin/com/apurebase/kgraphql/specification/typesystem/TypeSystemSpecificationTest.kt
index b9178e8b..b19b2243 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/typesystem/TypeSystemSpecificationTest.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/specification/typesystem/TypeSystemSpecificationTest.kt
@@ -1,9 +1,9 @@
-package com.github.pgutkowski.kgraphql.specification.typesystem
+package com.apurebase.kgraphql.specification.typesystem
 
-import com.github.pgutkowski.kgraphql.KGraphQL.Companion.schema
-import com.github.pgutkowski.kgraphql.Specification
-import com.github.pgutkowski.kgraphql.expect
-import com.github.pgutkowski.kgraphql.schema.SchemaException
+import com.apurebase.kgraphql.KGraphQL.Companion.schema
+import com.apurebase.kgraphql.Specification
+import com.apurebase.kgraphql.expect
+import com.apurebase.kgraphql.schema.SchemaException
 import org.junit.Test
 
 @Specification("3 Type System")
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/typesystem/UnionsSpecificationTest.kt b/src/test/kotlin/com/apurebase/kgraphql/specification/typesystem/UnionsSpecificationTest.kt
similarity index 89%
rename from src/test/kotlin/com/github/pgutkowski/kgraphql/specification/typesystem/UnionsSpecificationTest.kt
rename to src/test/kotlin/com/apurebase/kgraphql/specification/typesystem/UnionsSpecificationTest.kt
index 436f73a3..d51ab53a 100644
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/typesystem/UnionsSpecificationTest.kt
+++ b/src/test/kotlin/com/apurebase/kgraphql/specification/typesystem/UnionsSpecificationTest.kt
@@ -1,12 +1,12 @@
-package com.github.pgutkowski.kgraphql.specification.typesystem
+package com.apurebase.kgraphql.specification.typesystem
 
-import com.github.pgutkowski.kgraphql.KGraphQL
-import com.github.pgutkowski.kgraphql.RequestException
-import com.github.pgutkowski.kgraphql.Specification
-import com.github.pgutkowski.kgraphql.expect
-import com.github.pgutkowski.kgraphql.extract
-import com.github.pgutkowski.kgraphql.integration.BaseSchemaTest
-import com.github.pgutkowski.kgraphql.schema.SchemaException
+import com.apurebase.kgraphql.KGraphQL
+import com.apurebase.kgraphql.RequestException
+import com.apurebase.kgraphql.Specification
+import com.apurebase.kgraphql.expect
+import com.apurebase.kgraphql.extract
+import com.apurebase.kgraphql.integration.BaseSchemaTest
+import com.apurebase.kgraphql.schema.SchemaException
 import org.hamcrest.CoreMatchers
 import org.hamcrest.MatcherAssert
 import org.junit.Test
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/request/RequestTokenizationTest.kt b/src/test/kotlin/com/github/pgutkowski/kgraphql/request/RequestTokenizationTest.kt
deleted file mode 100644
index fd8063fc..00000000
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/request/RequestTokenizationTest.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.github.pgutkowski.kgraphql.request
-
-import org.hamcrest.CoreMatchers.equalTo
-import org.hamcrest.MatcherAssert.assertThat
-import org.junit.Test
-
-/**
- * Not lots of tests, as tokenization is mostly covered by Query and Mutation tests
- */
-class RequestTokenizationTest {
-
-    fun testTokenization(input : String, expected : List<String>) {
-        val tokens = tokenizeRequest(input)
-        assertThat(tokens, equalTo(expected))
-    }
-
-    @Test
-    fun `tokenize mutation with args`(){
-        testTokenization(
-                input = "{createHero(name: \"Batman\", appearsIn: \"The Dark Knight\")}",
-                expected = listOf("{", "createHero", "(", "name", ":", "\"Batman\"", "appearsIn", ":", "\"The Dark Knight\"", ")", "}")
-        )
-    }
-
-    @Test
-    fun `tokenize simple query`(){
-        testTokenization(
-                input = "{batman: hero(name: \"Batman\"){ skills : powers }}",
-                expected = listOf("{", "batman", ":", "hero", "(", "name", ":", "\"Batman\"", ")", "{", "skills", ":", "powers", "}", "}")
-        )
-    }
-
-    @Test
-    fun `tokenize query with nested selection set`(){
-        testTokenization(
-                input = "{hero{name appearsIn{title{abbr full} year}}\nvillain{name deeds}}",
-                expected = listOf(
-                        "{", "hero", "{", "name", "appearsIn", "{", "title", "{", "abbr", "full", "}", "year", "}", "}",
-                        "villain", "{", "name", "deeds", "}", "}"
-                )
-        )
-    }
-
-    @Test
-    fun `Tokenize list argument`(){
-        testTokenization(
-                input = "{List(value : [23, 3, 23])}",
-                expected = listOf(
-                        "{", "List","(", "value", ":", "[", "23", "3", "23", "]", ")","}"
-                )
-        )
-    }
-
-    @Test
-    fun `tokenize input with quotes`(){
-        testTokenization(
-                input = "{hello(name : \"Ted\\\" Mosby\")}",
-                expected = listOf("{", "hello", "(", "name", ":", "\"Ted\\\" Mosby\"", ")", "}")
-        )
-    }
-}
\ No newline at end of file
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/language/ArgumentsSpecificationTest.kt b/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/language/ArgumentsSpecificationTest.kt
deleted file mode 100644
index bab1585e..00000000
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/language/ArgumentsSpecificationTest.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.github.pgutkowski.kgraphql.specification.language
-
-import com.github.pgutkowski.kgraphql.Actor
-import com.github.pgutkowski.kgraphql.Specification
-import com.github.pgutkowski.kgraphql.defaultSchema
-import com.github.pgutkowski.kgraphql.deserialize
-import com.github.pgutkowski.kgraphql.executeEqualQueries
-import org.hamcrest.CoreMatchers.equalTo
-import org.hamcrest.MatcherAssert.assertThat
-import org.junit.Test
-
-@Specification("2.6 Arguments")
-class ArgumentsSpecificationTest {
-    val age = 432
-
-    val schema = defaultSchema {
-        query("actor") {
-            resolver { -> Actor("Boguś Linda", age) }
-        }
-
-        type<Actor>{
-            property<List<String>>("favDishes") {
-                resolver { _: Actor, size: Int, prefix: String? ->
-                    listOf("steak", "burger", "soup", "salad", "bread", "bird").let { dishes ->
-                        if(prefix != null){
-                            dishes.filter { it.startsWith(prefix) }
-                        } else {
-                            dishes
-                        }
-                    }.take(size)
-                }
-            }
-        }
-    }
-
-    @Test
-    fun `arguments are unordered`(){
-        executeEqualQueries( schema,
-                mapOf("data" to mapOf("actor" to mapOf("favDishes" to listOf("burger", "bread")))),
-                "{actor{favDishes(size: 2, prefix: \"b\")}}",
-                "{actor{favDishes(prefix: \"b\", size: 2)}}"
-        )
-    }
-
-    @Test
-    fun `many arguments can exist on given field`(){
-        val response = deserialize(schema.execute("{actor{favDishes(size: 2, prefix: \"b\")}}")) as Map<String, Any>
-        assertThat (
-                response, equalTo(mapOf<String, Any>("data" to mapOf("actor" to mapOf("favDishes" to listOf("burger", "bread")))))
-        )
-    }
-
-
-}
diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/language/VariablesSpecificationTest.kt b/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/language/VariablesSpecificationTest.kt
deleted file mode 100644
index b429ea0f..00000000
--- a/src/test/kotlin/com/github/pgutkowski/kgraphql/specification/language/VariablesSpecificationTest.kt
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.github.pgutkowski.kgraphql.specification.language
-
-import com.github.pgutkowski.kgraphql.Specification
-import com.github.pgutkowski.kgraphql.assertNoErrors
-import com.github.pgutkowski.kgraphql.expect
-import com.github.pgutkowski.kgraphql.extract
-import com.github.pgutkowski.kgraphql.integration.BaseSchemaTest
-import org.hamcrest.CoreMatchers.equalTo
-import org.hamcrest.MatcherAssert.assertThat
-import org.junit.Test
-
-@Specification("2.10 Variables")
-class VariablesSpecificationTest : BaseSchemaTest() {
-    @Test
-    fun `query with variables`(){
-        val map = execute(
-                query = "mutation(\$name: String!, \$age : Int!) {createActor(name: \$name, age: \$age){name, age}}",
-                variables = "{\"name\":\"Boguś Linda\", \"age\": 22}"
-        )
-        assertNoErrors(map)
-        assertThat(
-                map.extract<Map<String, Any>>("data/createActor"),
-                equalTo(mapOf("name" to "Boguś Linda", "age" to 22))
-        )
-    }
-
-    @Test
-    fun `query with boolean variable`(){
-        val map = execute(query = "query(\$big: Boolean!) {number(big: \$big)}", variables = "{\"big\": true}")
-        assertNoErrors(map)
-        assertThat(map.extract<Int>("data/number"), equalTo(10000))
-    }
-
-    @Test
-    fun `query with boolean variable default value`(){
-        val map = execute(query = "query(\$big: Boolean = true) {number(big: \$big)}")
-        assertNoErrors(map)
-        assertThat(map.extract<Int>("data/number"), equalTo(10000))
-    }
-
-    @Test
-    fun `query with variables and string default value`(){
-        val map = execute(
-                query = "mutation(\$name: String = \"Boguś Linda\", \$age : Int!) {createActor(name: \$name, age: \$age){name, age}}",
-                variables = "{\"age\": 22}"
-        )
-        assertNoErrors(map)
-        assertThat(
-                map.extract<Map<String, Any>>("data/createActor"),
-                equalTo(mapOf("name" to "Boguś Linda", "age" to 22))
-        )
-    }
-
-    @Test
-    fun `query with variables and default value pointing to another variable`(){
-        val map = execute(
-                query = "mutation(\$name: String = \"Boguś Linda\", \$age : Int = \$defaultAge, \$defaultAge : Int!) " +
-                        "{createActor(name: \$name, age: \$age){name, age}}",
-                variables = "{\"defaultAge\": 22}"
-        )
-        assertNoErrors(map)
-        assertThat(
-                map.extract<Map<String, Any>>("data/createActor"),
-                equalTo(mapOf("name" to "Boguś Linda", "age" to 22))
-        )
-    }
-
-    @Test
-    fun `fragment with variable`(){
-        val map = execute(
-                query = "mutation(\$name: String = \"Boguś Linda\", \$age : Int!, \$big: Boolean!) {createActor(name: \$name, age: \$age){...Linda}}" +
-                        "fragment Linda on Actor {picture(big: \$big)}",
-                variables = "{\"age\": 22, \"big\": true}"
-        )
-        assertNoErrors(map)
-        assertThat(
-                map.extract<String>("data/createActor/picture"),
-                equalTo("http://picture.server/pic/Boguś_Linda?big=true")
-        )
-    }
-
-    @Test
-    fun `fragment with missing variable`(){
-        expect<IllegalArgumentException>("Variable '\$big' was not declared for this operation"){
-            execute(
-                    query = "mutation(\$name: String = \"Boguś Linda\", \$age : Int!) {createActor(name: \$name, age: \$age){...Linda}}" +
-                            "fragment Linda on Actor {picture(big: \$big)}",
-                    variables = "{\"age\": 22}"
-            )
-        }
-    }
-}
\ No newline at end of file