diff --git a/core-kotlin/.gitignore b/core-kotlin/.gitignore
deleted file mode 100644
index 0c017e8f8c..0000000000
--- a/core-kotlin/.gitignore
+++ /dev/null
@@ -1,14 +0,0 @@
-/bin/
-
-#ignore gradle
-.gradle/
-
-
-#ignore build and generated files
-build/
-node/
-out/
-
-#ignore installed node modules and package lock file
-node_modules/
-package-lock.json
diff --git a/core-kotlin/README.md b/core-kotlin/README.md
deleted file mode 100644
index 4476ef7225..0000000000
--- a/core-kotlin/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-## Core Kotlin
-
-This module contains articles about core Kotlin.
-
-### Relevant articles:
-
-- [Fuel HTTP Library with Kotlin](https://www.baeldung.com/kotlin-fuel)
-- [Introduction to Kovenant Library for Kotlin](https://www.baeldung.com/kotlin-kovenant)
-- [Dependency Injection for Kotlin with Injekt](https://www.baeldung.com/kotlin-dependency-injection-with-injekt)
-- More articles: [[next -->]](/core-kotlin-2)
diff --git a/core-kotlin/build.gradle b/core-kotlin/build.gradle
deleted file mode 100755
index 2b6527fca7..0000000000
--- a/core-kotlin/build.gradle
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-group 'com.baeldung.ktor'
-version '1.0-SNAPSHOT'
-
-
-buildscript {
- ext.kotlin_version = '1.2.41'
-
- repositories {
- mavenCentral()
- }
- dependencies {
-
- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
- }
-}
-
-apply plugin: 'java'
-apply plugin: 'kotlin'
-apply plugin: 'application'
-
-mainClassName = 'APIServer.kt'
-
-sourceCompatibility = 1.8
-compileKotlin { kotlinOptions.jvmTarget = "1.8" }
-compileTestKotlin { kotlinOptions.jvmTarget = "1.8" }
-
-kotlin { experimental { coroutines "enable" } }
-
-repositories {
- mavenCentral()
- jcenter()
- maven { url "https://dl.bintray.com/kotlin/ktor" }
-}
-sourceSets {
- main{
- kotlin{
- srcDirs 'com/baeldung/ktor'
- }
- }
-
-}
-
-dependencies {
- compile "ch.qos.logback:logback-classic:1.2.1"
- testCompile group: 'junit', name: 'junit', version: '4.12'
-}
\ No newline at end of file
diff --git a/core-kotlin/gradle/wrapper/gradle-wrapper.jar b/core-kotlin/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100755
index 01b8bf6b1f..0000000000
Binary files a/core-kotlin/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/core-kotlin/gradle/wrapper/gradle-wrapper.properties b/core-kotlin/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100755
index 0b83b5a3e3..0000000000
--- a/core-kotlin/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
diff --git a/core-kotlin/gradlew b/core-kotlin/gradlew
deleted file mode 100755
index cccdd3d517..0000000000
--- a/core-kotlin/gradlew
+++ /dev/null
@@ -1,172 +0,0 @@
-#!/usr/bin/env sh
-
-##############################################################################
-##
-## Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
- echo "$*"
-}
-
-die () {
- echo
- echo "$*"
- echo
- exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
- CYGWIN* )
- cygwin=true
- ;;
- Darwin* )
- darwin=true
- ;;
- MINGW* )
- msys=true
- ;;
- NONSTOP* )
- nonstop=true
- ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
- # IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
- else
- JAVACMD="$JAVA_HOME/bin/java"
- fi
- if [ ! -x "$JAVACMD" ] ; then
- die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
- fi
-else
- JAVACMD="java"
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ] ; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
- MAX_FD="$MAX_FD_LIMIT"
- fi
- ulimit -n $MAX_FD
- if [ $? -ne 0 ] ; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
- GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
- APP_HOME=`cygpath --path --mixed "$APP_HOME"`
- CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
- JAVACMD=`cygpath --unix "$JAVACMD"`
-
- # We build the pattern for arguments to be converted via cygpath
- ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
- SEP=""
- for dir in $ROOTDIRSRAW ; do
- ROOTDIRS="$ROOTDIRS$SEP$dir"
- SEP="|"
- done
- OURCYGPATTERN="(^($ROOTDIRS))"
- # Add a user-defined pattern to the cygpath arguments
- if [ "$GRADLE_CYGPATTERN" != "" ] ; then
- OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
- fi
- # Now convert the arguments - kludge to limit ourselves to /bin/sh
- i=0
- for arg in "$@" ; do
- CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
- CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
-
- if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
- eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
- else
- eval `echo args$i`="\"$arg\""
- fi
- i=$((i+1))
- done
- case $i in
- (0) set -- ;;
- (1) set -- "$args0" ;;
- (2) set -- "$args0" "$args1" ;;
- (3) set -- "$args0" "$args1" "$args2" ;;
- (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
- (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
- (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
- esac
-fi
-
-# Escape application args
-save () {
- for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
- echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
- cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"
diff --git a/core-kotlin/gradlew.bat b/core-kotlin/gradlew.bat
deleted file mode 100755
index e95643d6a2..0000000000
--- a/core-kotlin/gradlew.bat
+++ /dev/null
@@ -1,84 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/core-kotlin/pom.xml b/core-kotlin/pom.xml
deleted file mode 100644
index b09192a03e..0000000000
--- a/core-kotlin/pom.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
- 4.0.0
- core-kotlin
- core-kotlin
- jar
-
-
- com.baeldung
- parent-kotlin
- 1.0.0-SNAPSHOT
- ../parent-kotlin
-
-
-
-
- org.apache.commons
- commons-lang3
- ${commons-lang3.version}
-
-
- org.assertj
- assertj-core
- ${assertj.version}
- test
-
-
- com.h2database
- h2
- ${h2.version}
-
-
- com.github.kittinunf.fuel
- fuel
- ${fuel.version}
-
-
- com.github.kittinunf.fuel
- fuel-gson
- ${fuel.version}
-
-
- com.github.kittinunf.fuel
- fuel-rxjava
- ${fuel.version}
-
-
- com.github.kittinunf.fuel
- fuel-coroutines
- ${fuel.version}
-
-
- nl.komponents.kovenant
- kovenant
- ${kovenant.version}
- pom
-
-
- uy.kohesive.injekt
- injekt-core
- ${injekt-core.version}
-
-
-
-
- 5.2.0
- 3.10.0
- 1.15.0
- 3.3.0
- 1.16.1
-
-
-
diff --git a/core-kotlin/resources/logback.xml b/core-kotlin/resources/logback.xml
deleted file mode 100755
index 274cdcdb02..0000000000
--- a/core-kotlin/resources/logback.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
- %d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/core-kotlin/settings.gradle b/core-kotlin/settings.gradle
deleted file mode 100755
index 13bbce9583..0000000000
--- a/core-kotlin/settings.gradle
+++ /dev/null
@@ -1,2 +0,0 @@
-rootProject.name = 'KtorWithKotlin'
-
diff --git a/core-kotlin/src/main/resources/logback.xml b/core-kotlin/src/main/resources/logback.xml
deleted file mode 100644
index 7d900d8ea8..0000000000
--- a/core-kotlin/src/main/resources/logback.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/kotlin-libraries-2/README.md b/kotlin-libraries-2/README.md
index 4064ef67d8..f725048acd 100644
--- a/kotlin-libraries-2/README.md
+++ b/kotlin-libraries-2/README.md
@@ -8,4 +8,7 @@ This module contains articles about Kotlin Libraries.
- [Introduction to RxKotlin](https://www.baeldung.com/rxkotlin)
- [MockK: A Mocking Library for Kotlin](https://www.baeldung.com/kotlin-mockk)
- [Kotlin Immutable Collections](https://www.baeldung.com/kotlin-immutable-collections)
+- [Dependency Injection for Kotlin with Injekt](https://www.baeldung.com/kotlin-dependency-injection-with-injekt)
+- [Fuel HTTP Library with Kotlin](https://www.baeldung.com/kotlin-fuel)
+- [Introduction to Kovenant Library for Kotlin](https://www.baeldung.com/kotlin-kovenant)
- More articles: [[<-- prev]](/kotlin-libraries)
diff --git a/kotlin-libraries-2/pom.xml b/kotlin-libraries-2/pom.xml
index 518142403e..27dc91d156 100644
--- a/kotlin-libraries-2/pom.xml
+++ b/kotlin-libraries-2/pom.xml
@@ -39,6 +39,37 @@
kotlinx-collections-immutable
${kotlinx-collections-immutable.version}
+
+ uy.kohesive.injekt
+ injekt-core
+ ${injekt-core.version}
+
+
+ com.github.kittinunf.fuel
+ fuel
+ ${fuel.version}
+
+
+ com.github.kittinunf.fuel
+ fuel-gson
+ ${fuel.version}
+
+
+ com.github.kittinunf.fuel
+ fuel-rxjava
+ ${fuel.version}
+
+
+ com.github.kittinunf.fuel
+ fuel-coroutines
+ ${fuel.version}
+
+
+ nl.komponents.kovenant
+ kovenant
+ ${kovenant.version}
+ pom
+
io.mockk
@@ -49,6 +80,9 @@
+ 1.16.1
+ 1.15.0
+ 3.3.0
27.1-jre
1.9.3
0.1
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/fuel/Interceptors.kt b/kotlin-libraries-2/src/main/kotlin/com/baeldung/fuel/Interceptors.kt
similarity index 100%
rename from core-kotlin/src/main/kotlin/com/baeldung/fuel/Interceptors.kt
rename to kotlin-libraries-2/src/main/kotlin/com/baeldung/fuel/Interceptors.kt
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/fuel/Post.kt b/kotlin-libraries-2/src/main/kotlin/com/baeldung/fuel/Post.kt
similarity index 100%
rename from core-kotlin/src/main/kotlin/com/baeldung/fuel/Post.kt
rename to kotlin-libraries-2/src/main/kotlin/com/baeldung/fuel/Post.kt
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/fuel/PostRoutingAPI.kt b/kotlin-libraries-2/src/main/kotlin/com/baeldung/fuel/PostRoutingAPI.kt
similarity index 100%
rename from core-kotlin/src/main/kotlin/com/baeldung/fuel/PostRoutingAPI.kt
rename to kotlin-libraries-2/src/main/kotlin/com/baeldung/fuel/PostRoutingAPI.kt
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/injekt/DelegateInjectionApplication.kt b/kotlin-libraries-2/src/main/kotlin/com/baeldung/injekt/DelegateInjectionApplication.kt
similarity index 100%
rename from core-kotlin/src/main/kotlin/com/baeldung/injekt/DelegateInjectionApplication.kt
rename to kotlin-libraries-2/src/main/kotlin/com/baeldung/injekt/DelegateInjectionApplication.kt
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/injekt/KeyedApplication.kt b/kotlin-libraries-2/src/main/kotlin/com/baeldung/injekt/KeyedApplication.kt
similarity index 80%
rename from core-kotlin/src/main/kotlin/com/baeldung/injekt/KeyedApplication.kt
rename to kotlin-libraries-2/src/main/kotlin/com/baeldung/injekt/KeyedApplication.kt
index 744459b7fe..4205678981 100644
--- a/core-kotlin/src/main/kotlin/com/baeldung/injekt/KeyedApplication.kt
+++ b/kotlin-libraries-2/src/main/kotlin/com/baeldung/injekt/KeyedApplication.kt
@@ -1,8 +1,12 @@
package com.baeldung.injekt
import org.slf4j.LoggerFactory
-import uy.kohesive.injekt.*
-import uy.kohesive.injekt.api.*
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.InjektMain
+import uy.kohesive.injekt.api.InjektRegistrar
+import uy.kohesive.injekt.api.addPerKeyFactory
+import uy.kohesive.injekt.api.addSingletonFactory
+import uy.kohesive.injekt.api.get
class KeyedApplication {
companion object : InjektMain() {
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/injekt/ModularApplication.kt b/kotlin-libraries-2/src/main/kotlin/com/baeldung/injekt/ModularApplication.kt
similarity index 94%
rename from core-kotlin/src/main/kotlin/com/baeldung/injekt/ModularApplication.kt
rename to kotlin-libraries-2/src/main/kotlin/com/baeldung/injekt/ModularApplication.kt
index e802f3f6d5..96a0c9556a 100644
--- a/core-kotlin/src/main/kotlin/com/baeldung/injekt/ModularApplication.kt
+++ b/kotlin-libraries-2/src/main/kotlin/com/baeldung/injekt/ModularApplication.kt
@@ -1,7 +1,8 @@
package com.baeldung.injekt
import org.slf4j.LoggerFactory
-import uy.kohesive.injekt.*
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.InjektMain
import uy.kohesive.injekt.api.*
class ModularApplication {
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/injekt/PerThreadApplication.kt b/kotlin-libraries-2/src/main/kotlin/com/baeldung/injekt/PerThreadApplication.kt
similarity index 84%
rename from core-kotlin/src/main/kotlin/com/baeldung/injekt/PerThreadApplication.kt
rename to kotlin-libraries-2/src/main/kotlin/com/baeldung/injekt/PerThreadApplication.kt
index a42f314349..f3167bc223 100644
--- a/core-kotlin/src/main/kotlin/com/baeldung/injekt/PerThreadApplication.kt
+++ b/kotlin-libraries-2/src/main/kotlin/com/baeldung/injekt/PerThreadApplication.kt
@@ -1,8 +1,12 @@
package com.baeldung.injekt
import org.slf4j.LoggerFactory
-import uy.kohesive.injekt.*
-import uy.kohesive.injekt.api.*
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.InjektMain
+import uy.kohesive.injekt.api.InjektRegistrar
+import uy.kohesive.injekt.api.addPerThreadFactory
+import uy.kohesive.injekt.api.addSingletonFactory
+import uy.kohesive.injekt.api.get
import java.util.*
import java.util.concurrent.Executors
import java.util.concurrent.TimeUnit
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/injekt/SimpleApplication.kt b/kotlin-libraries-2/src/main/kotlin/com/baeldung/injekt/SimpleApplication.kt
similarity index 75%
rename from core-kotlin/src/main/kotlin/com/baeldung/injekt/SimpleApplication.kt
rename to kotlin-libraries-2/src/main/kotlin/com/baeldung/injekt/SimpleApplication.kt
index 2b07cd059f..5c2dc28ba5 100644
--- a/core-kotlin/src/main/kotlin/com/baeldung/injekt/SimpleApplication.kt
+++ b/kotlin-libraries-2/src/main/kotlin/com/baeldung/injekt/SimpleApplication.kt
@@ -1,8 +1,12 @@
package com.baeldung.injekt
import org.slf4j.LoggerFactory
-import uy.kohesive.injekt.*
-import uy.kohesive.injekt.api.*
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.InjektMain
+import uy.kohesive.injekt.api.InjektRegistrar
+import uy.kohesive.injekt.api.addSingleton
+import uy.kohesive.injekt.api.addSingletonFactory
+import uy.kohesive.injekt.api.get
class SimpleApplication {
companion object : InjektMain() {
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/fuel/FuelHttpUnitTest.kt b/kotlin-libraries-2/src/test/kotlin/com/baeldung/fuel/FuelHttpUnitTest.kt
similarity index 100%
rename from core-kotlin/src/test/kotlin/com/baeldung/fuel/FuelHttpUnitTest.kt
rename to kotlin-libraries-2/src/test/kotlin/com/baeldung/fuel/FuelHttpUnitTest.kt
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/KovenantTest.kt b/kotlin-libraries-2/src/test/kotlin/com/baeldung/kovenant/KovenantTest.kt
similarity index 99%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlin/KovenantTest.kt
rename to kotlin-libraries-2/src/test/kotlin/com/baeldung/kovenant/KovenantTest.kt
index 469118f0f6..046b7380f7 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/KovenantTest.kt
+++ b/kotlin-libraries-2/src/test/kotlin/com/baeldung/kovenant/KovenantTest.kt
@@ -1,4 +1,4 @@
-package com.baeldung.kotlin
+package com.baeldung.kovenant
import nl.komponents.kovenant.*
import nl.komponents.kovenant.Kovenant.deferred
@@ -12,6 +12,7 @@ import java.util.*
import java.util.concurrent.TimeUnit
class KovenantTest {
+
@Before
fun setupTestMode() {
Kovenant.testMode { error ->
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/KovenantTimeoutTest.kt b/kotlin-libraries-2/src/test/kotlin/com/baeldung/kovenant/KovenantTimeoutTest.kt
similarity index 96%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlin/KovenantTimeoutTest.kt
rename to kotlin-libraries-2/src/test/kotlin/com/baeldung/kovenant/KovenantTimeoutTest.kt
index e37d2cc2fa..d98f9c538f 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/KovenantTimeoutTest.kt
+++ b/kotlin-libraries-2/src/test/kotlin/com/baeldung/kovenant/KovenantTimeoutTest.kt
@@ -1,4 +1,4 @@
-package com.baeldung.kotlin
+package com.baeldung.kovenant
import nl.komponents.kovenant.Promise
import nl.komponents.kovenant.any
diff --git a/pom.xml b/pom.xml
index 0eaa17cc21..0adc12312d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -659,7 +659,7 @@
spring-boot-kotlin
spring-boot-libraries
spring-boot-logging-log4j2
- spring-boot-mvc
+ spring-boot-mvc-2
spring-boot-mvc-2
spring-boot-mvc-birt
spring-boot-nashorn