Further classes restructuring and code cleanup

gradle.properties

@@ -24,9 +24,6 @@
 android.enableJetifier=false
 android.nonTransitiveRClass=true
 android.useAndroidX=true
-kapt.include.compile.classpath=true
-kapt.incremental.apt=true
-kapt.use.worker.api=true
 kotlin.code.style=official
 kotlin.daemon.jvm.options=-Xmx4096M
 kotlin.incremental=true