diff --git a/Modules/Channels/channels/js/index.html b/Modules/Channels/js/index.html
similarity index 100%
rename from Modules/Channels/channels/js/index.html
rename to Modules/Channels/js/index.html
diff --git a/Modules/Channels/channels/js/src/main/scala/channel/JsMessageBuffer.scala b/Modules/Channels/js/src/main/scala/channel/JsMessageBuffer.scala
similarity index 100%
rename from Modules/Channels/channels/js/src/main/scala/channel/JsMessageBuffer.scala
rename to Modules/Channels/js/src/main/scala/channel/JsMessageBuffer.scala
diff --git a/Modules/Channels/channels/js/src/main/scala/loci/communicator/broadcastchannel/BroadcastChannelConnector.scala b/Modules/Channels/js/src/main/scala/loci/communicator/broadcastchannel/BroadcastChannelConnector.scala
similarity index 100%
rename from Modules/Channels/channels/js/src/main/scala/loci/communicator/broadcastchannel/BroadcastChannelConnector.scala
rename to Modules/Channels/js/src/main/scala/loci/communicator/broadcastchannel/BroadcastChannelConnector.scala
diff --git a/Modules/Channels/channels/js/src/main/scala/loci/communicator/webrtc/ConnectionArea.scala b/Modules/Channels/js/src/main/scala/loci/communicator/webrtc/ConnectionArea.scala
similarity index 100%
rename from Modules/Channels/channels/js/src/main/scala/loci/communicator/webrtc/ConnectionArea.scala
rename to Modules/Channels/js/src/main/scala/loci/communicator/webrtc/ConnectionArea.scala
diff --git a/Modules/Channels/channels/js/src/main/scala/loci/communicator/webrtc/WebRTCConnection.scala b/Modules/Channels/js/src/main/scala/loci/communicator/webrtc/WebRTCConnection.scala
similarity index 100%
rename from Modules/Channels/channels/js/src/main/scala/loci/communicator/webrtc/WebRTCConnection.scala
rename to Modules/Channels/js/src/main/scala/loci/communicator/webrtc/WebRTCConnection.scala
diff --git a/Modules/Channels/channels/js/src/main/scala/loci/communicator/webrtc/WebRTCConnector.scala b/Modules/Channels/js/src/main/scala/loci/communicator/webrtc/WebRTCConnector.scala
similarity index 100%
rename from Modules/Channels/channels/js/src/main/scala/loci/communicator/webrtc/WebRTCConnector.scala
rename to Modules/Channels/js/src/main/scala/loci/communicator/webrtc/WebRTCConnector.scala
diff --git a/Modules/Channels/channels/js/src/main/scala/loci/communicator/ws/webnative/WSConnector.scala b/Modules/Channels/js/src/main/scala/loci/communicator/ws/webnative/WSConnector.scala
similarity index 100%
rename from Modules/Channels/channels/js/src/main/scala/loci/communicator/ws/webnative/WSConnector.scala
rename to Modules/Channels/js/src/main/scala/loci/communicator/ws/webnative/WSConnector.scala
diff --git a/Modules/Channels/channels/js/src/test/scala/EchoWSTest.scala b/Modules/Channels/js/src/test/scala/EchoWSTest.scala
similarity index 100%
rename from Modules/Channels/channels/js/src/test/scala/EchoWSTest.scala
rename to Modules/Channels/js/src/test/scala/EchoWSTest.scala
diff --git a/Modules/Channels/channels/jvm/src/main/scala/channel/tcp/TCPHandler.scala b/Modules/Channels/jvm/src/main/scala/channel/tcp/TCPHandler.scala
similarity index 100%
rename from Modules/Channels/channels/jvm/src/main/scala/channel/tcp/TCPHandler.scala
rename to Modules/Channels/jvm/src/main/scala/channel/tcp/TCPHandler.scala
diff --git a/Modules/Channels/channels/jvm/src/main/scala/channel/tcp/TCPListener.scala b/Modules/Channels/jvm/src/main/scala/channel/tcp/TCPListener.scala
similarity index 100%
rename from Modules/Channels/channels/jvm/src/main/scala/channel/tcp/TCPListener.scala
rename to Modules/Channels/jvm/src/main/scala/channel/tcp/TCPListener.scala
diff --git a/Modules/Channels/channels/jvm/src/main/scala/channel/udp/UDP.scala b/Modules/Channels/jvm/src/main/scala/channel/udp/UDP.scala
similarity index 100%
rename from Modules/Channels/channels/jvm/src/main/scala/channel/udp/UDP.scala
rename to Modules/Channels/jvm/src/main/scala/channel/udp/UDP.scala
diff --git a/Modules/Channels/channels/jvm/src/main/scala/loci/communicator/ws/jetty/Socket.scala b/Modules/Channels/jvm/src/main/scala/loci/communicator/ws/jetty/Socket.scala
similarity index 100%
rename from Modules/Channels/channels/jvm/src/main/scala/loci/communicator/ws/jetty/Socket.scala
rename to Modules/Channels/jvm/src/main/scala/loci/communicator/ws/jetty/Socket.scala
diff --git a/Modules/Channels/channels/jvm/src/test/scala/channel/EchoServerTestTCP.scala b/Modules/Channels/jvm/src/test/scala/channel/EchoServerTestTCP.scala
similarity index 100%
rename from Modules/Channels/channels/jvm/src/test/scala/channel/EchoServerTestTCP.scala
rename to Modules/Channels/jvm/src/test/scala/channel/EchoServerTestTCP.scala
diff --git a/Modules/Channels/channels/jvm/src/test/scala/channel/EchoServerTestUDP.scala b/Modules/Channels/jvm/src/test/scala/channel/EchoServerTestUDP.scala
similarity index 100%
rename from Modules/Channels/channels/jvm/src/test/scala/channel/EchoServerTestUDP.scala
rename to Modules/Channels/jvm/src/test/scala/channel/EchoServerTestUDP.scala
diff --git a/Modules/Channels/channels/jvm/src/test/scala/loci/registry/Jetty12WebSocketRegistrySpec.scala b/Modules/Channels/jvm/src/test/scala/loci/registry/Jetty12WebSocketRegistrySpec.scala
similarity index 100%
rename from Modules/Channels/channels/jvm/src/test/scala/loci/registry/Jetty12WebSocketRegistrySpec.scala
rename to Modules/Channels/jvm/src/test/scala/loci/registry/Jetty12WebSocketRegistrySpec.scala
diff --git a/Modules/Channels/channels/jvm/src/test/scala/loci/registry/JettyConnectTest.scala b/Modules/Channels/jvm/src/test/scala/loci/registry/JettyConnectTest.scala
similarity index 100%
rename from Modules/Channels/channels/jvm/src/test/scala/loci/registry/JettyConnectTest.scala
rename to Modules/Channels/jvm/src/test/scala/loci/registry/JettyConnectTest.scala
diff --git a/Modules/Channels/channels/shared/src/main/scala/channel/Channels.scala b/Modules/Channels/shared/src/main/scala/channel/Channels.scala
similarity index 100%
rename from Modules/Channels/channels/shared/src/main/scala/channel/Channels.scala
rename to Modules/Channels/shared/src/main/scala/channel/Channels.scala