diff --git a/build.gradle b/build.gradle
index bf96210..ab4664b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -74,6 +74,7 @@ task setBuildTool {
 }
 
 task compileDotNet {
+    dependsOn rdgen
     dependsOn setBuildTool
     doLast {
         def arguments = setBuildTool.args.clone()
diff --git a/src/rider/main/kotlin/com/jetbrains/rider/plugins/odatacliui/models/CliDialogModel.kt b/src/rider/main/kotlin/com/jetbrains/rider/plugins/odatacliui/models/CliDialogModel.kt
index ec9b4fd..a256165 100644
--- a/src/rider/main/kotlin/com/jetbrains/rider/plugins/odatacliui/models/CliDialogModel.kt
+++ b/src/rider/main/kotlin/com/jetbrains/rider/plugins/odatacliui/models/CliDialogModel.kt
@@ -1,7 +1,5 @@
 package com.jetbrains.rider.plugins.odatacliui.models
 
-import com.jetbrains.rider.plugins.odatacliui.MutableProperty
-
 class CliDialogModel(val cliVersion: String) {
     val serviceName = MutableProperty("")
     val metadataSource = MutableProperty("")
diff --git a/src/rider/main/kotlin/com/jetbrains/rider/plugins/odatacliui/MutableProperty.kt b/src/rider/main/kotlin/com/jetbrains/rider/plugins/odatacliui/models/MutableProperty.kt
similarity index 83%
rename from src/rider/main/kotlin/com/jetbrains/rider/plugins/odatacliui/MutableProperty.kt
rename to src/rider/main/kotlin/com/jetbrains/rider/plugins/odatacliui/models/MutableProperty.kt
index 3b4c61a..fec5f7e 100644
--- a/src/rider/main/kotlin/com/jetbrains/rider/plugins/odatacliui/MutableProperty.kt
+++ b/src/rider/main/kotlin/com/jetbrains/rider/plugins/odatacliui/models/MutableProperty.kt
@@ -1,4 +1,4 @@
-package com.jetbrains.rider.plugins.odatacliui
+package com.jetbrains.rider.plugins.odatacliui.models
 
 import com.intellij.ui.dsl.builder.MutableProperty