diff --git a/klib/platform.gradle b/klib/platform.gradle
deleted file mode 100644
index 920d3af95a4..00000000000
--- a/klib/platform.gradle
+++ /dev/null
@@ -1,46 +0,0 @@
-apply plugin: 'konan'
-
-buildscript {
-
-    def konanVersion = gradle.startParameter.projectProperties['konanVersion']
-
-    dependencies {
-        classpath files("../tools/kotlin-native-gradle-plugin/build/libs/kotlin-native-gradle-plugin-${konanVersion}.jar")
-    }
-}
-
-def taskName = "${gradle.startParameter.projectProperties['name']}"
-String konanHome = gradle.startParameter.projectProperties['konan.home']
-List<String> libs = gradle.startParameter.projectProperties.libraries.split(" ").findAll { !it.isEmpty() }
-String targetName = gradle.startParameter.projectProperties.target
-
-konan.targets = [targetName]
-
-konanArtifacts {
-    interop("$taskName") {
-        defFile gradle.startParameter.projectProperties.defFile
-        noDefaultLibs true
-        libraries {
-            files libs.collect { "$konanHome/klib/platform/$targetName/$it" }
-        }
-        extraOpts '--purge_user_libs'
-    }
-}
-
-def suffix = gradle.startParameter.projectProperties['suffix']
-def klibProgram = suffix?"$konanHome/bin/klib.$suffix" : "$konanHome/bin/klib"
-
-task klibInstall(type:Exec) {
-    String repo = "$konanHome/klib/platform/$targetName"
-    doFirst {
-        new File(repo).mkdirs()
-    }
-
-    dependsOn konanArtifacts."$taskName"."$targetName"
-    commandLine klibProgram,
-            'install',
-            konanArtifacts."$taskName"."$targetName".artifact,
-            '-target', gradle.startParameter.projectProperties.target,
-            '-repository',
-            repo
-}
diff --git a/platformLibs/build.gradle b/platformLibs/build.gradle
index 04815b38453..1818b64e645 100644
--- a/platformLibs/build.gradle
+++ b/platformLibs/build.gradle
@@ -30,7 +30,7 @@ private ArrayList<DefFile> targetDefFiles(String target) {
     def platform = targetToPlatform(target)
     def substitution = ['arch': target,
                         'os'  : targetToOs(target)]
-    rootProject.project(':klib').file("src/platform/$platform") // TODO: Move source from klib project into this project
+    file("src/platform/$platform")
             .listFiles()
             .findAll { it.name.endsWith(".def") }
             // The libz.a/libz.so and zlib.h are missing in raspberrypi and mips sysroots.
diff --git a/klib/src/platform/android/android.def b/platformLibs/src/platform/android/android.def
similarity index 100%
rename from klib/src/platform/android/android.def
rename to platformLibs/src/platform/android/android.def
diff --git a/klib/src/platform/android/egl.def b/platformLibs/src/platform/android/egl.def
similarity index 100%
rename from klib/src/platform/android/egl.def
rename to platformLibs/src/platform/android/egl.def
diff --git a/klib/src/platform/android/gles.def b/platformLibs/src/platform/android/gles.def
similarity index 100%
rename from klib/src/platform/android/gles.def
rename to platformLibs/src/platform/android/gles.def
diff --git a/klib/src/platform/android/gles2.def b/platformLibs/src/platform/android/gles2.def
similarity index 100%
rename from klib/src/platform/android/gles2.def
rename to platformLibs/src/platform/android/gles2.def
diff --git a/klib/src/platform/android/gles3.def b/platformLibs/src/platform/android/gles3.def
similarity index 100%
rename from klib/src/platform/android/gles3.def
rename to platformLibs/src/platform/android/gles3.def
diff --git a/klib/src/platform/android/glesCommon.def b/platformLibs/src/platform/android/glesCommon.def
similarity index 100%
rename from klib/src/platform/android/glesCommon.def
rename to platformLibs/src/platform/android/glesCommon.def
diff --git a/klib/src/platform/android/linux.def b/platformLibs/src/platform/android/linux.def
similarity index 100%
rename from klib/src/platform/android/linux.def
rename to platformLibs/src/platform/android/linux.def
diff --git a/klib/src/platform/android/media.def b/platformLibs/src/platform/android/media.def
similarity index 100%
rename from klib/src/platform/android/media.def
rename to platformLibs/src/platform/android/media.def
diff --git a/klib/src/platform/android/omxal.def b/platformLibs/src/platform/android/omxal.def
similarity index 100%
rename from klib/src/platform/android/omxal.def
rename to platformLibs/src/platform/android/omxal.def
diff --git a/klib/src/platform/android/posix.def b/platformLibs/src/platform/android/posix.def
similarity index 100%
rename from klib/src/platform/android/posix.def
rename to platformLibs/src/platform/android/posix.def
diff --git a/klib/src/platform/android/sles.def b/platformLibs/src/platform/android/sles.def
similarity index 100%
rename from klib/src/platform/android/sles.def
rename to platformLibs/src/platform/android/sles.def
diff --git a/klib/src/platform/android/zlib.def b/platformLibs/src/platform/android/zlib.def
similarity index 100%
rename from klib/src/platform/android/zlib.def
rename to platformLibs/src/platform/android/zlib.def
diff --git a/klib/src/platform/ios/AVFoundation.def b/platformLibs/src/platform/ios/AVFoundation.def
similarity index 100%
rename from klib/src/platform/ios/AVFoundation.def
rename to platformLibs/src/platform/ios/AVFoundation.def
diff --git a/klib/src/platform/ios/AVKit.def b/platformLibs/src/platform/ios/AVKit.def
similarity index 100%
rename from klib/src/platform/ios/AVKit.def
rename to platformLibs/src/platform/ios/AVKit.def
diff --git a/klib/src/platform/ios/Accelerate.def b/platformLibs/src/platform/ios/Accelerate.def
similarity index 100%
rename from klib/src/platform/ios/Accelerate.def
rename to platformLibs/src/platform/ios/Accelerate.def
diff --git a/klib/src/platform/ios/Accounts.def b/platformLibs/src/platform/ios/Accounts.def
similarity index 100%
rename from klib/src/platform/ios/Accounts.def
rename to platformLibs/src/platform/ios/Accounts.def
diff --git a/klib/src/platform/ios/AdSupport.def b/platformLibs/src/platform/ios/AdSupport.def
similarity index 100%
rename from klib/src/platform/ios/AdSupport.def
rename to platformLibs/src/platform/ios/AdSupport.def
diff --git a/klib/src/platform/ios/AddressBook.def b/platformLibs/src/platform/ios/AddressBook.def
similarity index 100%
rename from klib/src/platform/ios/AddressBook.def
rename to platformLibs/src/platform/ios/AddressBook.def
diff --git a/klib/src/platform/ios/AddressBookUI.def b/platformLibs/src/platform/ios/AddressBookUI.def
similarity index 100%
rename from klib/src/platform/ios/AddressBookUI.def
rename to platformLibs/src/platform/ios/AddressBookUI.def
diff --git a/klib/src/platform/ios/AssetsLibrary.def b/platformLibs/src/platform/ios/AssetsLibrary.def
similarity index 100%
rename from klib/src/platform/ios/AssetsLibrary.def
rename to platformLibs/src/platform/ios/AssetsLibrary.def
diff --git a/klib/src/platform/ios/AudioToolbox.def b/platformLibs/src/platform/ios/AudioToolbox.def
similarity index 100%
rename from klib/src/platform/ios/AudioToolbox.def
rename to platformLibs/src/platform/ios/AudioToolbox.def
diff --git a/klib/src/platform/ios/CFNetwork.def b/platformLibs/src/platform/ios/CFNetwork.def
similarity index 100%
rename from klib/src/platform/ios/CFNetwork.def
rename to platformLibs/src/platform/ios/CFNetwork.def
diff --git a/klib/src/platform/ios/CallKit.def b/platformLibs/src/platform/ios/CallKit.def
similarity index 100%
rename from klib/src/platform/ios/CallKit.def
rename to platformLibs/src/platform/ios/CallKit.def
diff --git a/klib/src/platform/ios/CloudKit.def b/platformLibs/src/platform/ios/CloudKit.def
similarity index 100%
rename from klib/src/platform/ios/CloudKit.def
rename to platformLibs/src/platform/ios/CloudKit.def
diff --git a/klib/src/platform/ios/Contacts.def b/platformLibs/src/platform/ios/Contacts.def
similarity index 100%
rename from klib/src/platform/ios/Contacts.def
rename to platformLibs/src/platform/ios/Contacts.def
diff --git a/klib/src/platform/ios/ContactsUI.def b/platformLibs/src/platform/ios/ContactsUI.def
similarity index 100%
rename from klib/src/platform/ios/ContactsUI.def
rename to platformLibs/src/platform/ios/ContactsUI.def
diff --git a/klib/src/platform/ios/CoreAudio.def b/platformLibs/src/platform/ios/CoreAudio.def
similarity index 100%
rename from klib/src/platform/ios/CoreAudio.def
rename to platformLibs/src/platform/ios/CoreAudio.def
diff --git a/klib/src/platform/ios/CoreAudioKit.def b/platformLibs/src/platform/ios/CoreAudioKit.def
similarity index 100%
rename from klib/src/platform/ios/CoreAudioKit.def
rename to platformLibs/src/platform/ios/CoreAudioKit.def
diff --git a/klib/src/platform/ios/CoreBluetooth.def b/platformLibs/src/platform/ios/CoreBluetooth.def
similarity index 100%
rename from klib/src/platform/ios/CoreBluetooth.def
rename to platformLibs/src/platform/ios/CoreBluetooth.def
diff --git a/klib/src/platform/ios/CoreData.def b/platformLibs/src/platform/ios/CoreData.def
similarity index 100%
rename from klib/src/platform/ios/CoreData.def
rename to platformLibs/src/platform/ios/CoreData.def
diff --git a/klib/src/platform/ios/CoreFoundation.def b/platformLibs/src/platform/ios/CoreFoundation.def
similarity index 100%
rename from klib/src/platform/ios/CoreFoundation.def
rename to platformLibs/src/platform/ios/CoreFoundation.def
diff --git a/klib/src/platform/ios/CoreGraphics.def b/platformLibs/src/platform/ios/CoreGraphics.def
similarity index 100%
rename from klib/src/platform/ios/CoreGraphics.def
rename to platformLibs/src/platform/ios/CoreGraphics.def
diff --git a/klib/src/platform/ios/CoreImage.def b/platformLibs/src/platform/ios/CoreImage.def
similarity index 100%
rename from klib/src/platform/ios/CoreImage.def
rename to platformLibs/src/platform/ios/CoreImage.def
diff --git a/klib/src/platform/ios/CoreLocation.def b/platformLibs/src/platform/ios/CoreLocation.def
similarity index 100%
rename from klib/src/platform/ios/CoreLocation.def
rename to platformLibs/src/platform/ios/CoreLocation.def
diff --git a/klib/src/platform/ios/CoreMIDI.def b/platformLibs/src/platform/ios/CoreMIDI.def
similarity index 100%
rename from klib/src/platform/ios/CoreMIDI.def
rename to platformLibs/src/platform/ios/CoreMIDI.def
diff --git a/klib/src/platform/ios/CoreMedia.def b/platformLibs/src/platform/ios/CoreMedia.def
similarity index 100%
rename from klib/src/platform/ios/CoreMedia.def
rename to platformLibs/src/platform/ios/CoreMedia.def
diff --git a/klib/src/platform/ios/CoreMotion.def b/platformLibs/src/platform/ios/CoreMotion.def
similarity index 100%
rename from klib/src/platform/ios/CoreMotion.def
rename to platformLibs/src/platform/ios/CoreMotion.def
diff --git a/klib/src/platform/ios/CoreSpotlight.def b/platformLibs/src/platform/ios/CoreSpotlight.def
similarity index 100%
rename from klib/src/platform/ios/CoreSpotlight.def
rename to platformLibs/src/platform/ios/CoreSpotlight.def
diff --git a/klib/src/platform/ios/CoreTelephony.def b/platformLibs/src/platform/ios/CoreTelephony.def
similarity index 100%
rename from klib/src/platform/ios/CoreTelephony.def
rename to platformLibs/src/platform/ios/CoreTelephony.def
diff --git a/klib/src/platform/ios/CoreText.def b/platformLibs/src/platform/ios/CoreText.def
similarity index 100%
rename from klib/src/platform/ios/CoreText.def
rename to platformLibs/src/platform/ios/CoreText.def
diff --git a/klib/src/platform/ios/CoreVideo.def b/platformLibs/src/platform/ios/CoreVideo.def
similarity index 100%
rename from klib/src/platform/ios/CoreVideo.def
rename to platformLibs/src/platform/ios/CoreVideo.def
diff --git a/klib/src/platform/ios/EAGL.def b/platformLibs/src/platform/ios/EAGL.def
similarity index 100%
rename from klib/src/platform/ios/EAGL.def
rename to platformLibs/src/platform/ios/EAGL.def
diff --git a/klib/src/platform/ios/EventKit.def b/platformLibs/src/platform/ios/EventKit.def
similarity index 100%
rename from klib/src/platform/ios/EventKit.def
rename to platformLibs/src/platform/ios/EventKit.def
diff --git a/klib/src/platform/ios/EventKitUI.def b/platformLibs/src/platform/ios/EventKitUI.def
similarity index 100%
rename from klib/src/platform/ios/EventKitUI.def
rename to platformLibs/src/platform/ios/EventKitUI.def
diff --git a/klib/src/platform/ios/ExternalAccessory.def b/platformLibs/src/platform/ios/ExternalAccessory.def
similarity index 100%
rename from klib/src/platform/ios/ExternalAccessory.def
rename to platformLibs/src/platform/ios/ExternalAccessory.def
diff --git a/klib/src/platform/ios/FileProvider.def b/platformLibs/src/platform/ios/FileProvider.def
similarity index 100%
rename from klib/src/platform/ios/FileProvider.def
rename to platformLibs/src/platform/ios/FileProvider.def
diff --git a/klib/src/platform/ios/Foundation.def b/platformLibs/src/platform/ios/Foundation.def
similarity index 100%
rename from klib/src/platform/ios/Foundation.def
rename to platformLibs/src/platform/ios/Foundation.def
diff --git a/klib/src/platform/ios/GLKit.def b/platformLibs/src/platform/ios/GLKit.def
similarity index 100%
rename from klib/src/platform/ios/GLKit.def
rename to platformLibs/src/platform/ios/GLKit.def
diff --git a/klib/src/platform/ios/GSS.def b/platformLibs/src/platform/ios/GSS.def
similarity index 100%
rename from klib/src/platform/ios/GSS.def
rename to platformLibs/src/platform/ios/GSS.def
diff --git a/klib/src/platform/ios/GameController.def b/platformLibs/src/platform/ios/GameController.def
similarity index 100%
rename from klib/src/platform/ios/GameController.def
rename to platformLibs/src/platform/ios/GameController.def
diff --git a/klib/src/platform/ios/GameKit.def b/platformLibs/src/platform/ios/GameKit.def
similarity index 100%
rename from klib/src/platform/ios/GameKit.def
rename to platformLibs/src/platform/ios/GameKit.def
diff --git a/klib/src/platform/ios/GameplayKit.def b/platformLibs/src/platform/ios/GameplayKit.def
similarity index 100%
rename from klib/src/platform/ios/GameplayKit.def
rename to platformLibs/src/platform/ios/GameplayKit.def
diff --git a/klib/src/platform/ios/HealthKit.def b/platformLibs/src/platform/ios/HealthKit.def
similarity index 100%
rename from klib/src/platform/ios/HealthKit.def
rename to platformLibs/src/platform/ios/HealthKit.def
diff --git a/klib/src/platform/ios/HealthKitUI.def b/platformLibs/src/platform/ios/HealthKitUI.def
similarity index 100%
rename from klib/src/platform/ios/HealthKitUI.def
rename to platformLibs/src/platform/ios/HealthKitUI.def
diff --git a/klib/src/platform/ios/HomeKit.def b/platformLibs/src/platform/ios/HomeKit.def
similarity index 100%
rename from klib/src/platform/ios/HomeKit.def
rename to platformLibs/src/platform/ios/HomeKit.def
diff --git a/klib/src/platform/ios/IOSurface.def b/platformLibs/src/platform/ios/IOSurface.def
similarity index 100%
rename from klib/src/platform/ios/IOSurface.def
rename to platformLibs/src/platform/ios/IOSurface.def
diff --git a/klib/src/platform/ios/ImageIO.def b/platformLibs/src/platform/ios/ImageIO.def
similarity index 100%
rename from klib/src/platform/ios/ImageIO.def
rename to platformLibs/src/platform/ios/ImageIO.def
diff --git a/klib/src/platform/ios/Intents.def b/platformLibs/src/platform/ios/Intents.def
similarity index 100%
rename from klib/src/platform/ios/Intents.def
rename to platformLibs/src/platform/ios/Intents.def
diff --git a/klib/src/platform/ios/IntentsUI.def b/platformLibs/src/platform/ios/IntentsUI.def
similarity index 100%
rename from klib/src/platform/ios/IntentsUI.def
rename to platformLibs/src/platform/ios/IntentsUI.def
diff --git a/klib/src/platform/ios/JavaScriptCore.def.disabled b/platformLibs/src/platform/ios/JavaScriptCore.def.disabled
similarity index 100%
rename from klib/src/platform/ios/JavaScriptCore.def.disabled
rename to platformLibs/src/platform/ios/JavaScriptCore.def.disabled
diff --git a/klib/src/platform/ios/LocalAuthentication.def b/platformLibs/src/platform/ios/LocalAuthentication.def
similarity index 100%
rename from klib/src/platform/ios/LocalAuthentication.def
rename to platformLibs/src/platform/ios/LocalAuthentication.def
diff --git a/klib/src/platform/ios/MapKit.def b/platformLibs/src/platform/ios/MapKit.def
similarity index 100%
rename from klib/src/platform/ios/MapKit.def
rename to platformLibs/src/platform/ios/MapKit.def
diff --git a/klib/src/platform/ios/MediaAccessibility.def b/platformLibs/src/platform/ios/MediaAccessibility.def
similarity index 100%
rename from klib/src/platform/ios/MediaAccessibility.def
rename to platformLibs/src/platform/ios/MediaAccessibility.def
diff --git a/klib/src/platform/ios/MediaPlayer.def b/platformLibs/src/platform/ios/MediaPlayer.def
similarity index 100%
rename from klib/src/platform/ios/MediaPlayer.def
rename to platformLibs/src/platform/ios/MediaPlayer.def
diff --git a/klib/src/platform/ios/MediaToolbox.def b/platformLibs/src/platform/ios/MediaToolbox.def
similarity index 100%
rename from klib/src/platform/ios/MediaToolbox.def
rename to platformLibs/src/platform/ios/MediaToolbox.def
diff --git a/klib/src/platform/ios/MessageUI.def b/platformLibs/src/platform/ios/MessageUI.def
similarity index 100%
rename from klib/src/platform/ios/MessageUI.def
rename to platformLibs/src/platform/ios/MessageUI.def
diff --git a/klib/src/platform/ios/Messages.def b/platformLibs/src/platform/ios/Messages.def
similarity index 100%
rename from klib/src/platform/ios/Messages.def
rename to platformLibs/src/platform/ios/Messages.def
diff --git a/klib/src/platform/ios/Metal.def b/platformLibs/src/platform/ios/Metal.def
similarity index 100%
rename from klib/src/platform/ios/Metal.def
rename to platformLibs/src/platform/ios/Metal.def
diff --git a/klib/src/platform/ios/MetalKit.def b/platformLibs/src/platform/ios/MetalKit.def
similarity index 100%
rename from klib/src/platform/ios/MetalKit.def
rename to platformLibs/src/platform/ios/MetalKit.def
diff --git a/klib/src/platform/ios/MetalPerformanceShaders.def.disabled b/platformLibs/src/platform/ios/MetalPerformanceShaders.def.disabled
similarity index 100%
rename from klib/src/platform/ios/MetalPerformanceShaders.def.disabled
rename to platformLibs/src/platform/ios/MetalPerformanceShaders.def.disabled
diff --git a/klib/src/platform/ios/MobileCoreServices.def b/platformLibs/src/platform/ios/MobileCoreServices.def
similarity index 100%
rename from klib/src/platform/ios/MobileCoreServices.def
rename to platformLibs/src/platform/ios/MobileCoreServices.def
diff --git a/klib/src/platform/ios/ModelIO.def b/platformLibs/src/platform/ios/ModelIO.def
similarity index 100%
rename from klib/src/platform/ios/ModelIO.def
rename to platformLibs/src/platform/ios/ModelIO.def
diff --git a/klib/src/platform/ios/MultipeerConnectivity.def b/platformLibs/src/platform/ios/MultipeerConnectivity.def
similarity index 100%
rename from klib/src/platform/ios/MultipeerConnectivity.def
rename to platformLibs/src/platform/ios/MultipeerConnectivity.def
diff --git a/klib/src/platform/ios/NetworkExtension.def b/platformLibs/src/platform/ios/NetworkExtension.def
similarity index 100%
rename from klib/src/platform/ios/NetworkExtension.def
rename to platformLibs/src/platform/ios/NetworkExtension.def
diff --git a/klib/src/platform/ios/NewsstandKit.def b/platformLibs/src/platform/ios/NewsstandKit.def
similarity index 100%
rename from klib/src/platform/ios/NewsstandKit.def
rename to platformLibs/src/platform/ios/NewsstandKit.def
diff --git a/klib/src/platform/ios/NotificationCenter.def b/platformLibs/src/platform/ios/NotificationCenter.def
similarity index 100%
rename from klib/src/platform/ios/NotificationCenter.def
rename to platformLibs/src/platform/ios/NotificationCenter.def
diff --git a/klib/src/platform/ios/OpenAL.def b/platformLibs/src/platform/ios/OpenAL.def
similarity index 100%
rename from klib/src/platform/ios/OpenAL.def
rename to platformLibs/src/platform/ios/OpenAL.def
diff --git a/klib/src/platform/ios/OpenGLES.def b/platformLibs/src/platform/ios/OpenGLES.def
similarity index 100%
rename from klib/src/platform/ios/OpenGLES.def
rename to platformLibs/src/platform/ios/OpenGLES.def
diff --git a/klib/src/platform/ios/OpenGLES2.def b/platformLibs/src/platform/ios/OpenGLES2.def
similarity index 100%
rename from klib/src/platform/ios/OpenGLES2.def
rename to platformLibs/src/platform/ios/OpenGLES2.def
diff --git a/klib/src/platform/ios/OpenGLES3.def b/platformLibs/src/platform/ios/OpenGLES3.def
similarity index 100%
rename from klib/src/platform/ios/OpenGLES3.def
rename to platformLibs/src/platform/ios/OpenGLES3.def
diff --git a/klib/src/platform/ios/OpenGLESCommon.def b/platformLibs/src/platform/ios/OpenGLESCommon.def
similarity index 100%
rename from klib/src/platform/ios/OpenGLESCommon.def
rename to platformLibs/src/platform/ios/OpenGLESCommon.def
diff --git a/klib/src/platform/ios/PassKit.def b/platformLibs/src/platform/ios/PassKit.def
similarity index 100%
rename from klib/src/platform/ios/PassKit.def
rename to platformLibs/src/platform/ios/PassKit.def
diff --git a/klib/src/platform/ios/Photos.def b/platformLibs/src/platform/ios/Photos.def
similarity index 100%
rename from klib/src/platform/ios/Photos.def
rename to platformLibs/src/platform/ios/Photos.def
diff --git a/klib/src/platform/ios/PhotosUI.def b/platformLibs/src/platform/ios/PhotosUI.def
similarity index 100%
rename from klib/src/platform/ios/PhotosUI.def
rename to platformLibs/src/platform/ios/PhotosUI.def
diff --git a/klib/src/platform/ios/PushKit.def b/platformLibs/src/platform/ios/PushKit.def
similarity index 100%
rename from klib/src/platform/ios/PushKit.def
rename to platformLibs/src/platform/ios/PushKit.def
diff --git a/klib/src/platform/ios/QuartzCore.def b/platformLibs/src/platform/ios/QuartzCore.def
similarity index 100%
rename from klib/src/platform/ios/QuartzCore.def
rename to platformLibs/src/platform/ios/QuartzCore.def
diff --git a/klib/src/platform/ios/QuickLook.def b/platformLibs/src/platform/ios/QuickLook.def
similarity index 100%
rename from klib/src/platform/ios/QuickLook.def
rename to platformLibs/src/platform/ios/QuickLook.def
diff --git a/klib/src/platform/ios/ReplayKit.def b/platformLibs/src/platform/ios/ReplayKit.def
similarity index 100%
rename from klib/src/platform/ios/ReplayKit.def
rename to platformLibs/src/platform/ios/ReplayKit.def
diff --git a/klib/src/platform/ios/SafariServices.def b/platformLibs/src/platform/ios/SafariServices.def
similarity index 100%
rename from klib/src/platform/ios/SafariServices.def
rename to platformLibs/src/platform/ios/SafariServices.def
diff --git a/klib/src/platform/ios/SceneKit.def b/platformLibs/src/platform/ios/SceneKit.def
similarity index 100%
rename from klib/src/platform/ios/SceneKit.def
rename to platformLibs/src/platform/ios/SceneKit.def
diff --git a/klib/src/platform/ios/Security.def b/platformLibs/src/platform/ios/Security.def
similarity index 100%
rename from klib/src/platform/ios/Security.def
rename to platformLibs/src/platform/ios/Security.def
diff --git a/klib/src/platform/ios/Social.def b/platformLibs/src/platform/ios/Social.def
similarity index 100%
rename from klib/src/platform/ios/Social.def
rename to platformLibs/src/platform/ios/Social.def
diff --git a/klib/src/platform/ios/Speech.def b/platformLibs/src/platform/ios/Speech.def
similarity index 100%
rename from klib/src/platform/ios/Speech.def
rename to platformLibs/src/platform/ios/Speech.def
diff --git a/klib/src/platform/ios/SpriteKit.def b/platformLibs/src/platform/ios/SpriteKit.def
similarity index 100%
rename from klib/src/platform/ios/SpriteKit.def
rename to platformLibs/src/platform/ios/SpriteKit.def
diff --git a/klib/src/platform/ios/StoreKit.def b/platformLibs/src/platform/ios/StoreKit.def
similarity index 100%
rename from klib/src/platform/ios/StoreKit.def
rename to platformLibs/src/platform/ios/StoreKit.def
diff --git a/klib/src/platform/ios/SystemConfiguration.def b/platformLibs/src/platform/ios/SystemConfiguration.def
similarity index 100%
rename from klib/src/platform/ios/SystemConfiguration.def
rename to platformLibs/src/platform/ios/SystemConfiguration.def
diff --git a/klib/src/platform/ios/Twitter.def b/platformLibs/src/platform/ios/Twitter.def
similarity index 100%
rename from klib/src/platform/ios/Twitter.def
rename to platformLibs/src/platform/ios/Twitter.def
diff --git a/klib/src/platform/ios/UIKit.def b/platformLibs/src/platform/ios/UIKit.def
similarity index 100%
rename from klib/src/platform/ios/UIKit.def
rename to platformLibs/src/platform/ios/UIKit.def
diff --git a/klib/src/platform/ios/UserNotifications.def b/platformLibs/src/platform/ios/UserNotifications.def
similarity index 100%
rename from klib/src/platform/ios/UserNotifications.def
rename to platformLibs/src/platform/ios/UserNotifications.def
diff --git a/klib/src/platform/ios/UserNotificationsUI.def b/platformLibs/src/platform/ios/UserNotificationsUI.def
similarity index 100%
rename from klib/src/platform/ios/UserNotificationsUI.def
rename to platformLibs/src/platform/ios/UserNotificationsUI.def
diff --git a/klib/src/platform/ios/VideoSubscriberAccount.def b/platformLibs/src/platform/ios/VideoSubscriberAccount.def
similarity index 100%
rename from klib/src/platform/ios/VideoSubscriberAccount.def
rename to platformLibs/src/platform/ios/VideoSubscriberAccount.def
diff --git a/klib/src/platform/ios/VideoToolbox.def b/platformLibs/src/platform/ios/VideoToolbox.def
similarity index 100%
rename from klib/src/platform/ios/VideoToolbox.def
rename to platformLibs/src/platform/ios/VideoToolbox.def
diff --git a/klib/src/platform/ios/WatchConnectivity.def b/platformLibs/src/platform/ios/WatchConnectivity.def
similarity index 100%
rename from klib/src/platform/ios/WatchConnectivity.def
rename to platformLibs/src/platform/ios/WatchConnectivity.def
diff --git a/klib/src/platform/ios/WatchKit.def b/platformLibs/src/platform/ios/WatchKit.def
similarity index 100%
rename from klib/src/platform/ios/WatchKit.def
rename to platformLibs/src/platform/ios/WatchKit.def
diff --git a/klib/src/platform/ios/WebKit.def b/platformLibs/src/platform/ios/WebKit.def
similarity index 100%
rename from klib/src/platform/ios/WebKit.def
rename to platformLibs/src/platform/ios/WebKit.def
diff --git a/klib/src/platform/ios/darwin.def b/platformLibs/src/platform/ios/darwin.def
similarity index 100%
rename from klib/src/platform/ios/darwin.def
rename to platformLibs/src/platform/ios/darwin.def
diff --git a/klib/src/platform/ios/iAd.def b/platformLibs/src/platform/ios/iAd.def
similarity index 100%
rename from klib/src/platform/ios/iAd.def
rename to platformLibs/src/platform/ios/iAd.def
diff --git a/klib/src/platform/ios/objc.def b/platformLibs/src/platform/ios/objc.def
similarity index 100%
rename from klib/src/platform/ios/objc.def
rename to platformLibs/src/platform/ios/objc.def
diff --git a/klib/src/platform/ios/posix.def b/platformLibs/src/platform/ios/posix.def
similarity index 100%
rename from klib/src/platform/ios/posix.def
rename to platformLibs/src/platform/ios/posix.def
diff --git a/klib/src/platform/ios/zlib.def b/platformLibs/src/platform/ios/zlib.def
similarity index 100%
rename from klib/src/platform/ios/zlib.def
rename to platformLibs/src/platform/ios/zlib.def
diff --git a/klib/src/platform/linux/linux.def b/platformLibs/src/platform/linux/linux.def
similarity index 100%
rename from klib/src/platform/linux/linux.def
rename to platformLibs/src/platform/linux/linux.def
diff --git a/klib/src/platform/linux/posix.def b/platformLibs/src/platform/linux/posix.def
similarity index 100%
rename from klib/src/platform/linux/posix.def
rename to platformLibs/src/platform/linux/posix.def
diff --git a/klib/src/platform/linux/zlib.def b/platformLibs/src/platform/linux/zlib.def
similarity index 100%
rename from klib/src/platform/linux/zlib.def
rename to platformLibs/src/platform/linux/zlib.def
diff --git a/klib/src/platform/osx/AppKit.def b/platformLibs/src/platform/osx/AppKit.def
similarity index 100%
rename from klib/src/platform/osx/AppKit.def
rename to platformLibs/src/platform/osx/AppKit.def
diff --git a/klib/src/platform/osx/ApplicationServices.def b/platformLibs/src/platform/osx/ApplicationServices.def
similarity index 100%
rename from klib/src/platform/osx/ApplicationServices.def
rename to platformLibs/src/platform/osx/ApplicationServices.def
diff --git a/klib/src/platform/osx/CFNetwork.def b/platformLibs/src/platform/osx/CFNetwork.def
similarity index 100%
rename from klib/src/platform/osx/CFNetwork.def
rename to platformLibs/src/platform/osx/CFNetwork.def
diff --git a/klib/src/platform/osx/CoreData.def b/platformLibs/src/platform/osx/CoreData.def
similarity index 100%
rename from klib/src/platform/osx/CoreData.def
rename to platformLibs/src/platform/osx/CoreData.def
diff --git a/klib/src/platform/osx/CoreFoundation.def b/platformLibs/src/platform/osx/CoreFoundation.def
similarity index 100%
rename from klib/src/platform/osx/CoreFoundation.def
rename to platformLibs/src/platform/osx/CoreFoundation.def
diff --git a/klib/src/platform/osx/CoreGraphics.def b/platformLibs/src/platform/osx/CoreGraphics.def
similarity index 100%
rename from klib/src/platform/osx/CoreGraphics.def
rename to platformLibs/src/platform/osx/CoreGraphics.def
diff --git a/klib/src/platform/osx/CoreImage.def b/platformLibs/src/platform/osx/CoreImage.def
similarity index 100%
rename from klib/src/platform/osx/CoreImage.def
rename to platformLibs/src/platform/osx/CoreImage.def
diff --git a/klib/src/platform/osx/CoreServices.def b/platformLibs/src/platform/osx/CoreServices.def
similarity index 100%
rename from klib/src/platform/osx/CoreServices.def
rename to platformLibs/src/platform/osx/CoreServices.def
diff --git a/klib/src/platform/osx/CoreText.def b/platformLibs/src/platform/osx/CoreText.def
similarity index 100%
rename from klib/src/platform/osx/CoreText.def
rename to platformLibs/src/platform/osx/CoreText.def
diff --git a/klib/src/platform/osx/CoreVideo.def b/platformLibs/src/platform/osx/CoreVideo.def
similarity index 100%
rename from klib/src/platform/osx/CoreVideo.def
rename to platformLibs/src/platform/osx/CoreVideo.def
diff --git a/klib/src/platform/osx/DiskArbitration.def b/platformLibs/src/platform/osx/DiskArbitration.def
similarity index 100%
rename from klib/src/platform/osx/DiskArbitration.def
rename to platformLibs/src/platform/osx/DiskArbitration.def
diff --git a/klib/src/platform/osx/Foundation.def b/platformLibs/src/platform/osx/Foundation.def
similarity index 100%
rename from klib/src/platform/osx/Foundation.def
rename to platformLibs/src/platform/osx/Foundation.def
diff --git a/klib/src/platform/osx/GLUT.def b/platformLibs/src/platform/osx/GLUT.def
similarity index 100%
rename from klib/src/platform/osx/GLUT.def
rename to platformLibs/src/platform/osx/GLUT.def
diff --git a/klib/src/platform/osx/IOKit.def b/platformLibs/src/platform/osx/IOKit.def
similarity index 100%
rename from klib/src/platform/osx/IOKit.def
rename to platformLibs/src/platform/osx/IOKit.def
diff --git a/klib/src/platform/osx/IOSurface.def b/platformLibs/src/platform/osx/IOSurface.def
similarity index 100%
rename from klib/src/platform/osx/IOSurface.def
rename to platformLibs/src/platform/osx/IOSurface.def
diff --git a/klib/src/platform/osx/ImageIO.def b/platformLibs/src/platform/osx/ImageIO.def
similarity index 100%
rename from klib/src/platform/osx/ImageIO.def
rename to platformLibs/src/platform/osx/ImageIO.def
diff --git a/klib/src/platform/osx/Metal.def b/platformLibs/src/platform/osx/Metal.def
similarity index 100%
rename from klib/src/platform/osx/Metal.def
rename to platformLibs/src/platform/osx/Metal.def
diff --git a/klib/src/platform/osx/OpenGL.def b/platformLibs/src/platform/osx/OpenGL.def
similarity index 100%
rename from klib/src/platform/osx/OpenGL.def
rename to platformLibs/src/platform/osx/OpenGL.def
diff --git a/klib/src/platform/osx/OpenGL3.def b/platformLibs/src/platform/osx/OpenGL3.def
similarity index 100%
rename from klib/src/platform/osx/OpenGL3.def
rename to platformLibs/src/platform/osx/OpenGL3.def
diff --git a/klib/src/platform/osx/OpenGLCommon.def b/platformLibs/src/platform/osx/OpenGLCommon.def
similarity index 100%
rename from klib/src/platform/osx/OpenGLCommon.def
rename to platformLibs/src/platform/osx/OpenGLCommon.def
diff --git a/klib/src/platform/osx/QuartzCore.def b/platformLibs/src/platform/osx/QuartzCore.def
similarity index 100%
rename from klib/src/platform/osx/QuartzCore.def
rename to platformLibs/src/platform/osx/QuartzCore.def
diff --git a/klib/src/platform/osx/Security.def b/platformLibs/src/platform/osx/Security.def
similarity index 100%
rename from klib/src/platform/osx/Security.def
rename to platformLibs/src/platform/osx/Security.def
diff --git a/klib/src/platform/osx/libkern.def b/platformLibs/src/platform/osx/libkern.def
similarity index 100%
rename from klib/src/platform/osx/libkern.def
rename to platformLibs/src/platform/osx/libkern.def
diff --git a/klib/src/platform/osx/objc.def b/platformLibs/src/platform/osx/objc.def
similarity index 100%
rename from klib/src/platform/osx/objc.def
rename to platformLibs/src/platform/osx/objc.def
diff --git a/klib/src/platform/osx/osx.def b/platformLibs/src/platform/osx/osx.def
similarity index 100%
rename from klib/src/platform/osx/osx.def
rename to platformLibs/src/platform/osx/osx.def
diff --git a/klib/src/platform/osx/posix.def b/platformLibs/src/platform/osx/posix.def
similarity index 100%
rename from klib/src/platform/osx/posix.def
rename to platformLibs/src/platform/osx/posix.def
diff --git a/klib/src/platform/osx/zlib.def b/platformLibs/src/platform/osx/zlib.def
similarity index 100%
rename from klib/src/platform/osx/zlib.def
rename to platformLibs/src/platform/osx/zlib.def
diff --git a/klib/src/platform/windows/gdiplus.def b/platformLibs/src/platform/windows/gdiplus.def
similarity index 100%
rename from klib/src/platform/windows/gdiplus.def
rename to platformLibs/src/platform/windows/gdiplus.def
diff --git a/klib/src/platform/windows/posix.def b/platformLibs/src/platform/windows/posix.def
similarity index 100%
rename from klib/src/platform/windows/posix.def
rename to platformLibs/src/platform/windows/posix.def
diff --git a/klib/src/platform/windows/windows.def b/platformLibs/src/platform/windows/windows.def
similarity index 100%
rename from klib/src/platform/windows/windows.def
rename to platformLibs/src/platform/windows/windows.def