diff --git a/numass-control/src/main/kotlin/inr/numass/control/DeviceViewConnection.kt b/numass-control/src/main/kotlin/inr/numass/control/DeviceViewConnection.kt
index e061fe36..2781e702 100644
--- a/numass-control/src/main/kotlin/inr/numass/control/DeviceViewConnection.kt
+++ b/numass-control/src/main/kotlin/inr/numass/control/DeviceViewConnection.kt
@@ -5,7 +5,6 @@ import hep.dataforge.control.devices.Device
 import hep.dataforge.control.devices.DeviceListener
 import hep.dataforge.control.devices.PortSensor
 import hep.dataforge.control.devices.Sensor
-import hep.dataforge.fx.FXObject
 import hep.dataforge.fx.fragments.FXFragment
 import hep.dataforge.fx.fragments.FragmentWindow
 import hep.dataforge.values.Value
@@ -24,7 +23,7 @@ import java.util.*
 /**
  * Created by darksnake on 14-May-17.
  */
-abstract class DeviceViewConnection<D : Device> : Component(), Connection, DeviceListener, FXObject {
+abstract class DeviceViewConnection<D : Device> : Component(), Connection, DeviceListener {
 
     private val bindings = HashMap<String, ObjectBinding<Value>>()
 
@@ -141,7 +140,7 @@ abstract class DeviceViewConnection<D : Device> : Component(), Connection, Devic
             }
             togglebutton("View") {
                 isSelected = false
-                FragmentWindow.build(this){FXFragment.buildFromNode(device.name) { fxNode }}
+                FragmentWindow.build(this){FXFragment.buildFromNode(device.name) { getFxNode() }}
             }
         }
     }
diff --git a/numass-control/src/main/kotlin/inr/numass/control/NumassControlApplication.kt b/numass-control/src/main/kotlin/inr/numass/control/NumassControlApplication.kt
index 9cf9e00c..d10700a2 100644
--- a/numass-control/src/main/kotlin/inr/numass/control/NumassControlApplication.kt
+++ b/numass-control/src/main/kotlin/inr/numass/control/NumassControlApplication.kt
@@ -27,7 +27,7 @@ abstract class NumassControlApplication<D : Device> : App() {
         device = setupDevice()
         val controller = buildView(device)
         device.connect(controller, Roles.VIEW_ROLE, Roles.DEVICE_LISTENER_ROLE)
-        val scene = Scene(controller.pane)
+        val scene = Scene(controller.getPane())
         stage.scene = scene
 
         stage.show()
diff --git a/numass-control/vac/src/main/kotlin/inr/numass/control/readvac/VacCollectorViewConnection.kt b/numass-control/vac/src/main/kotlin/inr/numass/control/readvac/VacCollectorViewConnection.kt
index 6b9384bb..6bf083dc 100644
--- a/numass-control/vac/src/main/kotlin/inr/numass/control/readvac/VacCollectorViewConnection.kt
+++ b/numass-control/vac/src/main/kotlin/inr/numass/control/readvac/VacCollectorViewConnection.kt
@@ -108,7 +108,7 @@ class VacCollectorViewConnection : DeviceViewConnection<VacCollectorDevice>() {
                     hbarPolicy = ScrollPane.ScrollBarPolicy.NEVER
                     vbox {
                         viewList.forEach {
-                            add(it.fxNode)
+                            add(it.getFxNode())
                             separator(Orientation.HORIZONTAL)
                         }
                     }
diff --git a/numass-kserver/build.gradle b/numass-web/build.gradle
similarity index 100%
rename from numass-kserver/build.gradle
rename to numass-web/build.gradle
diff --git a/numass-kserver/src/main/kotlin/inr/numass/server/Interceptors.kt b/numass-web/src/main/kotlin/inr/numass/server/Interceptors.kt
similarity index 96%
rename from numass-kserver/src/main/kotlin/inr/numass/server/Interceptors.kt
rename to numass-web/src/main/kotlin/inr/numass/server/Interceptors.kt
index 0f6aa47e..009d7d15 100644
--- a/numass-kserver/src/main/kotlin/inr/numass/server/Interceptors.kt
+++ b/numass-web/src/main/kotlin/inr/numass/server/Interceptors.kt
@@ -85,7 +85,7 @@ val storageInterceptor = InterceptorFactory { context, meta ->
     }
 }
 
-val controlInterceptor = InterceptorFactory { context, meta ->
+val deviceInterceptor = InterceptorFactory { context, meta ->
     val deviceManager = context.getFeature(DeviceManager::class.java);
     ServerInterceptor("devices") {
         get("listDevices") {
diff --git a/numass-kserver/src/main/kotlin/inr/numass/server/KServerMain.kt b/numass-web/src/main/kotlin/inr/numass/server/KServerMain.kt
similarity index 90%
rename from numass-kserver/src/main/kotlin/inr/numass/server/KServerMain.kt
rename to numass-web/src/main/kotlin/inr/numass/server/KServerMain.kt
index 0eafd9d0..8e0f29ce 100644
--- a/numass-kserver/src/main/kotlin/inr/numass/server/KServerMain.kt
+++ b/numass-web/src/main/kotlin/inr/numass/server/KServerMain.kt
@@ -17,7 +17,7 @@ fun main(args: Array<String>) {
     }
 
     context.optFeature(DeviceManager::class.java).ifPresent{
-
+        server.intercept(deviceInterceptor)
     }
 
     server.start()
diff --git a/settings.gradle b/settings.gradle
index 7e2ed424..a5d282ab 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -13,7 +13,7 @@ include ":numass-core"
 include ":numass-client"
 include ":numass-server"
 include ":numass-server"
-include ":numass-kserver"
+include ":numass-web"
 include ":numass-test"
 //
 include ":numass-viewer"