46 files changed, 52 insertions, 52 deletions
diff --git a/README.md b/README.md
index cb5f397..1f8c586 100644
--- a/README.md
+++ b/README.md
@@ -3,17 +3,17 @@
 Web interface simulating a cockpit of an unmanned aerial vehicle, built with Akka and Play.
 
 This project is made of several subprojects:
- - `vfd-backend` contains the play application that runs the actual interface
- - `vfd-frontend` dynamic interface built with scalajs that is served by `vfd-backend`
- - `vfd-uav` library for communicating with UAVs
+ - `vfd-main` contains the play application that runs the actual interface
+ - `vfd-dashboard` dynamic interface built with scalajs that is served by the main backend
+ - `vfd-uav` communication library
 
 # Run
-First, switch to project `vfd-backend` and then `run`
+First, switch to project `vfd-main` and then `run`
 
-    project vfd-backend
+    project vfd-main
     run
 
-Calling `vfd-backend/run` directly will not work.
+Calling `vfd-main/run` directly will not work.
 
 # License
 Copyright (C) Jakob Odersky
diff --git a/project/Build.scala b/project/Build.scala
index b2a1b4b..b2b835c 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -20,43 +20,43 @@ object ApplicationBuild extends Build {
   )
 
   lazy val root = Project("root", file(".")).aggregate(
+    main,
     uav,
-    backend,
-    frontend
+    dashboard
   )
 
-  lazy val uav = (
-    Project("vfd-uav", file("vfd-uav"))
+  lazy val main = (
+    Project("vfd-main", file("vfd-main"))
+    enablePlugins(PlayScala)
     enablePlugins(SbtMavlink)
     settings(common: _*)
     settings(
+      resolvers += Resolver.url("scala-js-releases", url("http://dl.bintray.com/content/scala-js/scala-js-releases"))(Resolver.ivyStylePatterns),
       libraryDependencies ++= Seq(
-        akkaActor,
-        flow,
-        flowNative
+        bootstrap,
+        fontawesome,
+        jquery
       )
     )
+    dependsOn(uav)
+    dependsOnJs(dashboard)
   )
 
-  lazy val backend = (
-    Project("vfd-backend", file("vfd-backend"))
-    enablePlugins(PlayScala)
+  lazy val uav = (
+    Project("vfd-uav", file("vfd-uav"))
     enablePlugins(SbtMavlink)
     settings(common: _*)
     settings(
-      resolvers += Resolver.url("scala-js-releases", url("http://dl.bintray.com/content/scala-js/scala-js-releases"))(Resolver.ivyStylePatterns),
       libraryDependencies ++= Seq(
-        bootstrap,
-        fontawesome,
-        jquery
+        akkaActor,
+        flow,
+        flowNative
       )
     )
-    dependsOn(uav)
-    dependsOnJs(frontend)
   )
 
-  lazy val frontend = (
-    Project("vfd-frontend", file("vfd-frontend"))
+  lazy val dashboard = (
+    Project("vfd-dashboard", file("vfd-dashboard"))
     settings(ScalaJSPlugin.scalaJSSettings: _*)
     enablePlugins(SbtMavlink)
     settings(common: _*)
diff --git a/vfd-frontend/.gitignore b/vfd-dashboard/.gitignore
index e38fe35..e38fe35 100644
--- a/vfd-frontend/.gitignore
+++ b/vfd-dashboard/.gitignore
diff --git a/vfd-frontend/src/main/scala/vfd/frontend/Environment.scala b/vfd-dashboard/src/main/scala/vfd/dashboard/Environment.scala
index 53571f8..d4dd306 100644
--- a/vfd-frontend/src/main/scala/vfd/frontend/Environment.scala
+++ b/vfd-dashboard/src/main/scala/vfd/dashboard/Environment.scala
@@ -1,4 +1,4 @@
-package vfd.frontend
+package vfd.dashboard
 
 import org.scalajs.dom.HTMLElement
 
diff --git a/vfd-frontend/src/main/scala/vfd/frontend/Launcher.scala b/vfd-dashboard/src/main/scala/vfd/dashboard/Launcher.scala
index cf7ce94..6a9ba82 100644
--- a/vfd-frontend/src/main/scala/vfd/frontend/Launcher.scala
+++ b/vfd-dashboard/src/main/scala/vfd/dashboard/Launcher.scala
@@ -1,4 +1,4 @@
-package vfd.frontend
+package vfd.dashboard
 
 import scala.scalajs.js.annotation.JSExport
 
diff --git a/vfd-frontend/src/main/scala/vfd/frontend/Main.scala b/vfd-dashboard/src/main/scala/vfd/dashboard/Main.scala
index f4ef84d..36ca2db 100644
--- a/vfd-frontend/src/main/scala/vfd/frontend/Main.scala
+++ b/vfd-dashboard/src/main/scala/vfd/dashboard/Main.scala
@@ -1,6 +1,6 @@
-package vfd.frontend
+package vfd.dashboard
 
-import vfd.frontend.ui.Layout
+import vfd.dashboard.ui.Layout
 
 object Main {
 
diff --git a/vfd-frontend/src/main/scala/vfd/frontend/MavlinkSocket.scala b/vfd-dashboard/src/main/scala/vfd/dashboard/MavlinkSocket.scala
index 903020f..162ca64 100644
--- a/vfd-frontend/src/main/scala/vfd/frontend/MavlinkSocket.scala
+++ b/vfd-dashboard/src/main/scala/vfd/dashboard/MavlinkSocket.scala
@@ -1,4 +1,4 @@
-package vfd.frontend
+package vfd.dashboard
 
 import scala.scalajs.js
 import scala.scalajs.js.Any.fromFunction1
diff --git a/vfd-frontend/src/main/scala/vfd/frontend/ui/Layout.scala b/vfd-dashboard/src/main/scala/vfd/dashboard/ui/Layout.scala
index 5892402..29ca4ca 100644
--- a/vfd-frontend/src/main/scala/vfd/frontend/ui/Layout.scala
+++ b/vfd-dashboard/src/main/scala/vfd/dashboard/ui/Layout.scala
@@ -1,4 +1,4 @@
-package vfd.frontend.ui
+package vfd.dashboard.ui
 
 import org.scalajs.dom.HTMLElement
 
@@ -15,10 +15,10 @@ import scalatags.JsDom.all.stringFrag
 import scalatags.JsDom.all.stringStyle
 import scalatags.JsDom.all.style
 import scalatags.JsDom.all.width
-import vfd.frontend.Environment
-import vfd.frontend.MavlinkSocket
-import vfd.frontend.ui.panels.Communication
-import vfd.frontend.ui.panels.Primary
+import vfd.dashboard.Environment
+import vfd.dashboard.MavlinkSocket
+import vfd.dashboard.ui.panels.Communication
+import vfd.dashboard.ui.panels.Primary
 
 class Layout(socket: MavlinkSocket) {
 
diff --git a/vfd-frontend/src/main/scala/vfd/frontend/ui/components/SvgInstrument.scala b/vfd-dashboard/src/main/scala/vfd/dashboard/ui/components/SvgInstrument.scala
index c22daa0..8ddba1a 100644
--- a/vfd-frontend/src/main/scala/vfd/frontend/ui/components/SvgInstrument.scala
+++ b/vfd-dashboard/src/main/scala/vfd/dashboard/ui/components/SvgInstrument.scala
@@ -1,4 +1,4 @@
-package vfd.frontend.ui.components
+package vfd.dashboard.ui.components
 
 import scala.scalajs.js.Any.fromFunction1
 
@@ -11,7 +11,7 @@ import scalatags.JsDom.all.stringFrag
 import scalatags.JsDom.all.stringStyle
 import scalatags.JsDom.all.`type`
 import scalatags.JsDom.all.width
-import vfd.frontend.Environment
+import vfd.dashboard.Environment
 
 trait SvgInstrument[A] {
   
diff --git a/vfd-frontend/src/main/scala/vfd/frontend/ui/components/instruments.scala b/vfd-dashboard/src/main/scala/vfd/dashboard/ui/components/instruments.scala
index 08e164a..1cde83c 100644
--- a/vfd-frontend/src/main/scala/vfd/frontend/ui/components/instruments.scala
+++ b/vfd-dashboard/src/main/scala/vfd/dashboard/ui/components/instruments.scala
@@ -1,4 +1,4 @@
-package vfd.frontend.ui.components
+package vfd.dashboard.ui.components
 
 import org.scalajs.dom
 
@@ -9,7 +9,7 @@ import scalatags.JsDom.all.stringFrag
 import scalatags.JsDom.all.stringStyle
 import scalatags.JsDom.all.`type`
 import scalatags.JsDom.all.width
-import vfd.frontend.Environment
+import vfd.dashboard.Environment
 
 class Led(implicit env: Environment) extends SvgInstrument[String] {
   lazy val element = `object`(`type` := "image/svg+xml", "data".attr := env.asset("images/leds/led.svg"), width := "100%")(
diff --git a/vfd-frontend/src/main/scala/vfd/frontend/ui/panels/Communication.scala b/vfd-dashboard/src/main/scala/vfd/dashboard/ui/panels/Communication.scala
index 7fec52a..dd43ab4 100644
--- a/vfd-frontend/src/main/scala/vfd/frontend/ui/panels/Communication.scala
+++ b/vfd-dashboard/src/main/scala/vfd/dashboard/ui/panels/Communication.scala
@@ -1,4 +1,4 @@
-package vfd.frontend.ui.panels
+package vfd.dashboard.ui.panels
 
 import org.mavlink.messages.Heartbeat
 import org.mavlink.messages.Motor
@@ -13,12 +13,12 @@ import scalatags.JsDom.all.table
 import scalatags.JsDom.all.tbody
 import scalatags.JsDom.all.td
 import scalatags.JsDom.all._
-import vfd.frontend.Environment
-import vfd.frontend.MavlinkSocket
-import vfd.frontend.ui.components.Generic
-import vfd.frontend.ui.components.Balance
-import vfd.frontend.ui.components.Bar
-import vfd.frontend.ui.components.Led
+import vfd.dashboard.Environment
+import vfd.dashboard.MavlinkSocket
+import vfd.dashboard.ui.components.Generic
+import vfd.dashboard.ui.components.Balance
+import vfd.dashboard.ui.components.Bar
+import vfd.dashboard.ui.components.Led
 
 object Communication {
 
diff --git a/vfd-frontend/src/main/scala/vfd/frontend/ui/panels/Primary.scala b/vfd-dashboard/src/main/scala/vfd/dashboard/ui/panels/Primary.scala
index f5f260c..14b26f6 100644
--- a/vfd-frontend/src/main/scala/vfd/frontend/ui/panels/Primary.scala
+++ b/vfd-dashboard/src/main/scala/vfd/dashboard/ui/panels/Primary.scala
@@ -1,4 +1,4 @@
-package vfd.frontend.ui.panels
+package vfd.dashboard.ui.panels
 
 import org.mavlink.messages.Attitude
 import org.scalajs.dom.HTMLElement
@@ -11,11 +11,11 @@ import scalatags.JsDom.all.table
 import scalatags.JsDom.all.tbody
 import scalatags.JsDom.all.td
 import scalatags.JsDom.all.tr
-import vfd.frontend.Environment
-import vfd.frontend.MavlinkSocket
-import vfd.frontend.ui.components.Altimeter
-import vfd.frontend.ui.components.Compass
-import vfd.frontend.ui.components.Horizon
+import vfd.dashboard.Environment
+import vfd.dashboard.MavlinkSocket
+import vfd.dashboard.ui.components.Altimeter
+import vfd.dashboard.ui.components.Compass
+import vfd.dashboard.ui.components.Horizon
 
 object Primary {
 
diff --git a/vfd-backend/.gitignore b/vfd-main/.gitignore
index 1d1f507..1d1f507 100644
--- a/vfd-backend/.gitignore
+++ b/vfd-main/.gitignore
diff --git a/vfd-backend/app/controllers/Application.scala b/vfd-main/app/controllers/Application.scala
index 827950e..827950e 100644
--- a/vfd-backend/app/controllers/Application.scala
+++ b/vfd-main/app/controllers/Application.scala
diff --git a/vfd-backend/app/plugins/UavClientConnection.scala b/vfd-main/app/plugins/UavClientConnection.scala
index 76975e1..76975e1 100644
--- a/vfd-backend/app/plugins/UavClientConnection.scala
+++ b/vfd-main/app/plugins/UavClientConnection.scala
diff --git a/vfd-backend/app/plugins/UavPlugin.scala b/vfd-main/app/plugins/UavPlugin.scala
index 9b45627..9b45627 100644
--- a/vfd-backend/app/plugins/UavPlugin.scala
+++ b/vfd-main/app/plugins/UavPlugin.scala
diff --git a/vfd-backend/app/views/main.scala.html b/vfd-main/app/views/main.scala.html
index 1be335b..42f3999 100644
--- a/vfd-backend/app/views/main.scala.html
+++ b/vfd-main/app/views/main.scala.html
@@ -46,7 +46,7 @@
 
 	<script type="text/javascript" src="@routes.Assets.at("lib/jquery/jquery.js")"></script>
 	<script type="text/javascript" src="@routes.Assets.at("lib/bootstrap/js/bootstrap.min.js")"></script>
-	<script type="text/javascript" src="@routes.Assets.at("lib/vfd-frontend-fastopt.js")"></script>
+	<script type="text/javascript" src="@routes.Assets.at("lib/vfd-dashboard-fastopt.js")"></script>
 	
 </body>
 </html>
 \ No newline at end of file
diff --git a/vfd-backend/app/views/uav.scala.html b/vfd-main/app/views/uav.scala.html
index 0ce7927..0ce7927 100644
--- a/vfd-backend/app/views/uav.scala.html
+++ b/vfd-main/app/views/uav.scala.html
diff --git a/vfd-backend/conf/application.conf b/vfd-main/conf/application.conf
index c2026a3..c2026a3 100644
--- a/vfd-backend/conf/application.conf
+++ b/vfd-main/conf/application.conf
diff --git a/vfd-backend/conf/play.plugins b/vfd-main/conf/play.plugins
index 40c58dd..40c58dd 100644
--- a/vfd-backend/conf/play.plugins
+++ b/vfd-main/conf/play.plugins
diff --git a/vfd-backend/conf/routes b/vfd-main/conf/routes
index 3d38889..3d38889 100644
--- a/vfd-backend/conf/routes
+++ b/vfd-main/conf/routes
diff --git a/vfd-backend/public/audio/alarm.mp3 b/vfd-main/public/audio/alarm.mp3
index 97c83d5..97c83d5 100644
--- a/vfd-backend/public/audio/alarm.mp3
+++ b/vfd-main/public/audio/alarm.mp3
diff --git a/vfd-backend/public/audio/alarm.ogg b/vfd-main/public/audio/alarm.ogg
index 19a1717..19a1717 100644
--- a/vfd-backend/public/audio/alarm.ogg
+++ b/vfd-main/public/audio/alarm.ogg
diff --git a/vfd-backend/public/fonts/DIGITAL.TXT b/vfd-main/public/fonts/DIGITAL.TXT
index 484dd47..484dd47 100644
--- a/vfd-backend/public/fonts/DIGITAL.TXT
+++ b/vfd-main/public/fonts/DIGITAL.TXT
diff --git a/vfd-backend/public/fonts/DS-DIGIB.TTF b/vfd-main/public/fonts/DS-DIGIB.TTF
index 064ad47..064ad47 100644
--- a/vfd-backend/public/fonts/DS-DIGIB.TTF
+++ b/vfd-main/public/fonts/DS-DIGIB.TTF
diff --git a/vfd-backend/public/fonts/DS-DIGII.TTF b/vfd-main/public/fonts/DS-DIGII.TTF
index 2aae3d8..2aae3d8 100644
--- a/vfd-backend/public/fonts/DS-DIGII.TTF
+++ b/vfd-main/public/fonts/DS-DIGII.TTF
diff --git a/vfd-backend/public/fonts/DS-DIGIT.TTF b/vfd-main/public/fonts/DS-DIGIT.TTF
index 65642f9..65642f9 100644
--- a/vfd-backend/public/fonts/DS-DIGIT.TTF
+++ b/vfd-main/public/fonts/DS-DIGIT.TTF
diff --git a/vfd-backend/public/fonts/ds-digi.ttf b/vfd-main/public/fonts/ds-digi.ttf
index 0925877..0925877 100644
--- a/vfd-backend/public/fonts/ds-digi.ttf
+++ b/vfd-main/public/fonts/ds-digi.ttf
diff --git a/vfd-backend/public/images/instruments/altimeter.svg b/vfd-main/public/images/instruments/altimeter.svg
index 2bfb306..2bfb306 100644
--- a/vfd-backend/public/images/instruments/altimeter.svg
+++ b/vfd-main/public/images/instruments/altimeter.svg
diff --git a/vfd-backend/public/images/instruments/balance.svg b/vfd-main/public/images/instruments/balance.svg
index 57511e9..57511e9 100644
--- a/vfd-backend/public/images/instruments/balance.svg
+++ b/vfd-main/public/images/instruments/balance.svg
diff --git a/vfd-backend/public/images/instruments/bar.svg b/vfd-main/public/images/instruments/bar.svg
index 50ecebf..50ecebf 100644
--- a/vfd-backend/public/images/instruments/bar.svg
+++ b/vfd-main/public/images/instruments/bar.svg
diff --git a/vfd-backend/public/images/instruments/compass.svg b/vfd-main/public/images/instruments/compass.svg
index 83cf17b..83cf17b 100644
--- a/vfd-backend/public/images/instruments/compass.svg
+++ b/vfd-main/public/images/instruments/compass.svg
diff --git a/vfd-backend/public/images/instruments/distance.svg b/vfd-main/public/images/instruments/distance.svg
index 1f4d6ff..1f4d6ff 100644
--- a/vfd-backend/public/images/instruments/distance.svg
+++ b/vfd-main/public/images/instruments/distance.svg
diff --git a/vfd-backend/public/images/instruments/generic.svg b/vfd-main/public/images/instruments/generic.svg
index ac04b60..ac04b60 100644
--- a/vfd-backend/public/images/instruments/generic.svg
+++ b/vfd-main/public/images/instruments/generic.svg
diff --git a/vfd-backend/public/images/instruments/generic2.svg b/vfd-main/public/images/instruments/generic2.svg
index 02e4caa..02e4caa 100644
--- a/vfd-backend/public/images/instruments/generic2.svg
+++ b/vfd-main/public/images/instruments/generic2.svg
diff --git a/vfd-backend/public/images/instruments/horizon.svg b/vfd-main/public/images/instruments/horizon.svg
index 363b962..363b962 100644
--- a/vfd-backend/public/images/instruments/horizon.svg
+++ b/vfd-main/public/images/instruments/horizon.svg
diff --git a/vfd-backend/public/images/leds/green-off.svg b/vfd-main/public/images/leds/green-off.svg
index 1c227fd..1c227fd 100644
--- a/vfd-backend/public/images/leds/green-off.svg
+++ b/vfd-main/public/images/leds/green-off.svg
diff --git a/vfd-backend/public/images/leds/green-on.svg b/vfd-main/public/images/leds/green-on.svg
index c358e3a..c358e3a 100644
--- a/vfd-backend/public/images/leds/green-on.svg
+++ b/vfd-main/public/images/leds/green-on.svg
diff --git a/vfd-backend/public/images/leds/led.svg b/vfd-main/public/images/leds/led.svg
index 74cc4ff..74cc4ff 100644
--- a/vfd-backend/public/images/leds/led.svg
+++ b/vfd-main/public/images/leds/led.svg
diff --git a/vfd-backend/public/images/leds/none.svg b/vfd-main/public/images/leds/none.svg
index 85bc475..85bc475 100644
--- a/vfd-backend/public/images/leds/none.svg
+++ b/vfd-main/public/images/leds/none.svg
diff --git a/vfd-backend/public/images/leds/red-off.svg b/vfd-main/public/images/leds/red-off.svg
index ecd3ca5..ecd3ca5 100644
--- a/vfd-backend/public/images/leds/red-off.svg
+++ b/vfd-main/public/images/leds/red-off.svg
diff --git a/vfd-backend/public/images/leds/red-on.svg b/vfd-main/public/images/leds/red-on.svg
index e7fffea..e7fffea 100644
--- a/vfd-backend/public/images/leds/red-on.svg
+++ b/vfd-main/public/images/leds/red-on.svg
diff --git a/vfd-backend/public/images/leds/yellow-on.svg b/vfd-main/public/images/leds/yellow-on.svg
index 3b271b0..3b271b0 100644
--- a/vfd-backend/public/images/leds/yellow-on.svg
+++ b/vfd-main/public/images/leds/yellow-on.svg
diff --git a/vfd-backend/public/images/logo-invert.svg b/vfd-main/public/images/logo-invert.svg
index eb38e8f..eb38e8f 100644
--- a/vfd-backend/public/images/logo-invert.svg
+++ b/vfd-main/public/images/logo-invert.svg
diff --git a/vfd-backend/public/images/logo.svg b/vfd-main/public/images/logo.svg
index b905aad..b905aad 100644
--- a/vfd-backend/public/images/logo.svg
+++ b/vfd-main/public/images/logo.svg
diff --git a/vfd-backend/public/stylesheets/main.css b/vfd-main/public/stylesheets/main.css
index e92cd24..e92cd24 100644
--- a/vfd-backend/public/stylesheets/main.css
+++ b/vfd-main/public/stylesheets/main.css