diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index d2bf252..de47df0 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -2,9 +2,12 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <bytecodeTargetLevel>
+      <module name="binary-plugin-extension" target="1.8" />
       <module name="binary-plugin-extension-example" target="1.8" />
       <module name="binary-plugin-extension-example.main" target="1.8" />
       <module name="binary-plugin-extension-example.test" target="1.8" />
+      <module name="binary-plugin-extension.main" target="1.8" />
+      <module name="binary-plugin-extension.test" target="1.8" />
       <module name="precompiled-binary-plugin-dependency" target="1.8" />
       <module name="precompiled-binary-plugin-dependency.buildSrc" target="1.8" />
       <module name="precompiled-binary-plugin-dependency.buildSrc.main" target="1.8" />
diff --git a/.idea/gradle.iml b/.idea/gradle.iml
index 72d4f9f..6a9ace9 100644
--- a/.idea/gradle.iml
+++ b/.idea/gradle.iml
@@ -1,2 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="gradle" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4" />
\ No newline at end of file
+<module external.linked.project.id="gradle" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="CheckStyle-IDEA-Module">
+    <option name="configuration">
+      <map />
+    </option>
+  </component>
+</module>
\ No newline at end of file
diff --git a/binary-plugin/binary-plugin-assignment-test-project/gradle.properties b/binary-plugin/binary-plugin-assignment-test-project/gradle.properties
index 4cf8b91..1b19381 100644
--- a/binary-plugin/binary-plugin-assignment-test-project/gradle.properties
+++ b/binary-plugin/binary-plugin-assignment-test-project/gradle.properties
@@ -1,5 +1,15 @@
-filesPluginVersion=0.1.0
+# ---- Plugin Repositories ---------------------------------------------------------------------------------------------
+useGradlePluginPortal=true
+useMavenLocalCache=false
+useMavenPrivateRepo=false
+# ----------------------------------------------------------------------------------------------------------------------
 
+# ---- Sorting Plugin Version ------------------------------------------------------------------------------------------
+filesPluginVersion=1.0.0
+# ----------------------------------------------------------------------------------------------------------------------
+
+# ---- Sorting Configuration -------------------------------------------------------------------------------------------
 tasks.files.folder=files
 # sortType = [alphabet, date, extension]
-tasks.files.sortType=alphabet
\ No newline at end of file
+tasks.files.sortType=alphabet
+# ----------------------------------------------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/binary-plugin/binary-plugin-assignment-test-project/settings.gradle b/binary-plugin/binary-plugin-assignment-test-project/settings.gradle
index 907188e..bd282a4 100644
--- a/binary-plugin/binary-plugin-assignment-test-project/settings.gradle
+++ b/binary-plugin/binary-plugin-assignment-test-project/settings.gradle
@@ -12,16 +12,46 @@
  */
 pluginManagement {
   repositories {
-    gradlePluginPortal()
-    mavenLocal()
-    maven {
-      url = "http://localhost:8080/repository/internal"
-      name = "mavenArchivaPrivate"
-      allowInsecureProtocol = true
-      credentials {
-        username = "$privateArchivaUser"
-        password = "$privateArchivaPassword"
+    logger.info("---- settings.gradle Plugin Repositories ------------------------------------------------------------")
+    def gradlePluginPortalFlag = false
+    try {
+      gradlePluginPortalFlag = "${useGradlePluginPortal}"
+    } catch(Exception e) {
+      logger.info("\"useGradlePluginPortal\" variable isn't set in gradle.properties")
+    }
+    if(gradlePluginPortalFlag == "true") {
+      gradlePluginPortal()
+      logger.info("Using Gradle Plugin Portal")
+    }
+
+    def useMavenLocalFlag = false
+    try {
+      useMavenLocalFlag = "${useMavenLocalCache}"
+    } catch(Exception e) {
+      logger.info("\"useMavenLocalCache\" variable isn't set in gradle.properties")
+    }
+    if(useMavenLocalFlag == "true") {
+      mavenLocal()
+      logger.info("Using Maven Local Cache")
+    }
+
+    def useMavenPrivateFlag = false
+    try {
+      useMavenPrivateFlag = "${useMavenPrivateRepo}"
+    } catch(Exception e) {
+      logger.info("\"useMavenPrivateRepo\" variable isn't set in gradle.properties")
+    }
+    if(useMavenPrivateFlag == "true") {
+      maven {
+        url = "http://localhost:8080/repository/internal"
+        name = "mavenArchivaPrivate"
+        allowInsecureProtocol = true
+        credentials {
+          username = "$privateArchivaUser"
+          password = "$privateArchivaPassword"
+        }
       }
+      logger.info("Using Maven Private Repository at http://localhost:8080/repository/internal")
     }
   }
 }
diff --git a/binary-plugin/binary-plugin-gradle-plugin-portal/.idea/binary-plugin-gradle-plugin-portal.iml b/binary-plugin/binary-plugin-gradle-plugin-portal/.idea/binary-plugin-gradle-plugin-portal.iml
new file mode 100644
index 0000000..b9428cd
--- /dev/null
+++ b/binary-plugin/binary-plugin-gradle-plugin-portal/.idea/binary-plugin-gradle-plugin-portal.iml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="binary-plugin-gradle-plugin-portal" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="com.rivancic" external.system.module.version="1.0.0" type="JAVA_MODULE" version="4" />
\ No newline at end of file
diff --git a/binary-plugin/binary-plugin-gradle-plugin-portal/.idea/compiler.xml b/binary-plugin/binary-plugin-gradle-plugin-portal/.idea/compiler.xml
index b73660a..61a9130 100644
--- a/binary-plugin/binary-plugin-gradle-plugin-portal/.idea/compiler.xml
+++ b/binary-plugin/binary-plugin-gradle-plugin-portal/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="15" />
+    <bytecodeTargetLevel target="1.8" />
   </component>
 </project>
\ No newline at end of file
diff --git a/binary-plugin/binary-plugin-gradle-plugin-portal/.idea/gradle.xml b/binary-plugin/binary-plugin-gradle-plugin-portal/.idea/gradle.xml
index 611e7c8..383b9a6 100644
--- a/binary-plugin/binary-plugin-gradle-plugin-portal/.idea/gradle.xml
+++ b/binary-plugin/binary-plugin-gradle-plugin-portal/.idea/gradle.xml
@@ -4,8 +4,11 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="delegatedBuild" value="true" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="adopt-openj9-15" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/binary-plugin/binary-plugin-gradle-plugin-portal/.idea/misc.xml b/binary-plugin/binary-plugin-gradle-plugin-portal/.idea/misc.xml
index 565e017..af103e3 100644
--- a/binary-plugin/binary-plugin-gradle-plugin-portal/.idea/misc.xml
+++ b/binary-plugin/binary-plugin-gradle-plugin-portal/.idea/misc.xml
@@ -4,7 +4,7 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_15" default="true" project-jdk-name="adopt-openj9-15" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="adopt-openj9-15" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/binary-plugin/binary-plugin-gradle-plugin-portal/.idea/modules/binary-plugin-gradle-plugin-portal.main.iml b/binary-plugin/binary-plugin-gradle-plugin-portal/.idea/modules/binary-plugin-gradle-plugin-portal.main.iml
new file mode 100644
index 0000000..4a4ce55
--- /dev/null
+++ b/binary-plugin/binary-plugin-gradle-plugin-portal/.idea/modules/binary-plugin-gradle-plugin-portal.main.iml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="CheckStyle-IDEA-Module">
+    <option name="configuration">
+      <map />
+    </option>
+  </component>
+</module>
\ No newline at end of file
diff --git a/binary-plugin/binary-plugin-gradle-plugin-portal/README.md b/binary-plugin/binary-plugin-gradle-plugin-portal/README.md
index bd8a207..3129741 100644
--- a/binary-plugin/binary-plugin-gradle-plugin-portal/README.md
+++ b/binary-plugin/binary-plugin-gradle-plugin-portal/README.md
@@ -7,6 +7,7 @@ Project with the configuration that can publish binary Gradle plugin to Gradle P
 In order to prepare the project for publishing it to Gradle Plugin Portal you have to make sure you add following configuration:
 
 1) Make sure you have a Gradle Plugin Portal account, which can be set up at a [login/registration page](https://plugins.gradle.org/user/login), and create key and its secret for the API access.
+   Alternatively to creation of API keys manually you can later use gradle   login task that will guide you through the process of setting up keys.
 
 2) Save Gradle Plugin Portal key and secret to `~/.gradle/gradle.properties`:
    
@@ -43,13 +44,18 @@ gradlePlugin {
 ```groovy
 pluginBundle {
   website = 'https://github.com/rivancic/gradle'
-  vcsUrl = 'https://github.com/rivancic/gradle/tree/master/binary-plugin'
+  vcsUrl = 'https://github.com/rivancic/gradle' // has to point to the root of the repository
   tags = ['files', 'sorting']
 }
 ```
 
 With `publishPlugins` task you can publish your plugin to Gradle Plugin Portal. As describe in the tutorial for publishing 
-for the first time you might wait a day or two that the plugin will be approved.
+for the first time you might wait a day or two that the plugin will be approved. In case your submission is not complete you 
+will receive an email with detailed explanation of what additional steps are necessary.
+
+## Published Version
+
+Plugin is being published on Gradle Plugin Portal as [com.rivancic.files-plugin](https://plugins.gradle.org/plugin/com.rivancic.files-plugin)
 
 ## Resources
 
diff --git a/binary-plugin/binary-plugin-gradle-plugin-portal/build.gradle b/binary-plugin/binary-plugin-gradle-plugin-portal/build.gradle
index 7442cdf..1f886d9 100644
--- a/binary-plugin/binary-plugin-gradle-plugin-portal/build.gradle
+++ b/binary-plugin/binary-plugin-gradle-plugin-portal/build.gradle
@@ -38,7 +38,7 @@ gradlePlugin {
  */
 pluginBundle {
   website = 'https://github.com/rivancic/gradle'
-  vcsUrl = 'https://github.com/rivancic/gradle/tree/master/binary-plugin'
+  vcsUrl = 'https://github.com/rivancic/gradle'
   tags = ['files', 'sorting']
 }