From 480f4e52bb737db60d67fc37c7d925ac71abb5cf Mon Sep 17 00:00:00 2001
From: Laura Radaelli <laura.radaelli.85@gmail.com>
Date: Wed, 25 Jan 2017 16:01:13 +0200
Subject: [PATCH] moved code for fx to voting-booth-gui

---
 voting-booth-gui/build.gradle                    |  3 +++
 .../voting/gui}/VotingBoothToyGraphicalRun.java  |  9 +++++----
 .../controllersFX/CastOrAuditController.java     | 16 +---------------
 .../controllersFX/ChannelChoiceController.java   |  8 +-------
 .../gui}/controllersFX/EmptyStartController.java |  2 +-
 .../gui}/controllersFX/LoadingController.java    |  2 +-
 .../gui}/controllersFX/MainController.java       |  2 +-
 .../gui}/controllersFX/PrinterController.java    |  2 +-
 .../gui}/controllersFX/VistaNavigator.java       |  4 ++--
 .../gui}/controllersFX/VotingController.java     |  3 +--
 .../controllersFX/WelcomeScreenController.java   |  2 +-
 .../voting/gui}/output/FXWindowOutputDevice.java |  6 +++---
 .../voting/gui}/output/GenerateQRCode.java       |  2 +-
 .../meerkat/voting/gui/uiFX}/GraphicalUI.java    |  9 ++++++---
 .../gui/{ui => uiFX}/GraphicalUserInterface.java |  4 +++-
 .../java/meerkat/voting/gui/uiFX}/MainFX.java    | 10 ++++------
 .../src/main/resources/views/castOrAudit.fxml    |  2 +-
 .../src/main/resources/views/channel_choice.fxml |  2 +-
 .../main/resources/views/channel_choice_old.fxml |  0
 .../src/main/resources/views/empty_start.fxml    |  2 +-
 .../src/main/resources/views/loading.fxml        |  2 +-
 .../src/main/resources/views/main.fxml           |  2 +-
 .../src/main/resources/views/printer.fxml        |  2 +-
 .../src/main/resources/views/vista.css           |  0
 .../src/main/resources/views/voting.fxml         |  2 +-
 .../src/main/resources/views/welcome_screen.fxml |  2 +-
 voting-booth/build.gradle                        |  4 ----
 .../meerkat/voting/gui/ui/TickerTimerTask.java   |  2 +-
 .../main/java/meerkat/voting/gui/ui/UIUtils.java |  6 +++---
 .../voting/output/AsyncRunnableOutputDevice.java |  8 ++++----
 30 files changed, 51 insertions(+), 69 deletions(-)
 rename {voting-booth/src/main/java/meerkat/voting => voting-booth-gui/src/main/java/meerkat/voting/gui}/VotingBoothToyGraphicalRun.java (98%)
 rename {voting-booth/src/main/java/meerkat/voting/gui/ui => voting-booth-gui/src/main/java/meerkat/voting/gui}/controllersFX/CastOrAuditController.java (68%)
 rename {voting-booth/src/main/java/meerkat/voting/gui/ui => voting-booth-gui/src/main/java/meerkat/voting/gui}/controllersFX/ChannelChoiceController.java (91%)
 rename {voting-booth/src/main/java/meerkat/voting/gui/ui => voting-booth-gui/src/main/java/meerkat/voting/gui}/controllersFX/EmptyStartController.java (90%)
 rename {voting-booth/src/main/java/meerkat/voting/gui/ui => voting-booth-gui/src/main/java/meerkat/voting/gui}/controllersFX/LoadingController.java (90%)
 rename {voting-booth/src/main/java/meerkat/voting/gui/ui => voting-booth-gui/src/main/java/meerkat/voting/gui}/controllersFX/MainController.java (96%)
 rename {voting-booth/src/main/java/meerkat/voting/gui/ui => voting-booth-gui/src/main/java/meerkat/voting/gui}/controllersFX/PrinterController.java (97%)
 rename {voting-booth/src/main/java/meerkat/voting/gui/ui => voting-booth-gui/src/main/java/meerkat/voting/gui}/controllersFX/VistaNavigator.java (98%)
 rename {voting-booth/src/main/java/meerkat/voting/gui/ui => voting-booth-gui/src/main/java/meerkat/voting/gui}/controllersFX/VotingController.java (96%)
 rename {voting-booth/src/main/java/meerkat/voting/gui/ui => voting-booth-gui/src/main/java/meerkat/voting/gui}/controllersFX/WelcomeScreenController.java (93%)
 rename {voting-booth/src/main/java/meerkat/voting => voting-booth-gui/src/main/java/meerkat/voting/gui}/output/FXWindowOutputDevice.java (97%)
 rename {voting-booth/src/main/java/meerkat/voting => voting-booth-gui/src/main/java/meerkat/voting/gui}/output/GenerateQRCode.java (98%)
 rename {voting-booth/src/main/java/meerkat/voting/gui/ui => voting-booth-gui/src/main/java/meerkat/voting/gui/uiFX}/GraphicalUI.java (98%)
 rename voting-booth-gui/src/main/java/meerkat/voting/gui/{ui => uiFX}/GraphicalUserInterface.java (98%)
 rename {voting-booth/src/main/java/meerkat/voting/gui/ui => voting-booth-gui/src/main/java/meerkat/voting/gui/uiFX}/MainFX.java (92%)
 rename {voting-booth => voting-booth-gui}/src/main/resources/views/castOrAudit.fxml (90%)
 rename {voting-booth => voting-booth-gui}/src/main/resources/views/channel_choice.fxml (91%)
 rename {voting-booth => voting-booth-gui}/src/main/resources/views/channel_choice_old.fxml (100%)
 rename {voting-booth => voting-booth-gui}/src/main/resources/views/empty_start.fxml (98%)
 rename {voting-booth => voting-booth-gui}/src/main/resources/views/loading.fxml (83%)
 rename {voting-booth => voting-booth-gui}/src/main/resources/views/main.fxml (93%)
 rename {voting-booth => voting-booth-gui}/src/main/resources/views/printer.fxml (87%)
 rename {voting-booth => voting-booth-gui}/src/main/resources/views/vista.css (100%)
 rename {voting-booth => voting-booth-gui}/src/main/resources/views/voting.fxml (92%)
 rename {voting-booth => voting-booth-gui}/src/main/resources/views/welcome_screen.fxml (98%)

diff --git a/voting-booth-gui/build.gradle b/voting-booth-gui/build.gradle
index 4ea83dc..a1e239a 100644
--- a/voting-booth-gui/build.gradle
+++ b/voting-booth-gui/build.gradle
@@ -71,6 +71,9 @@ dependencies {
     testCompile 'junit:junit:4.+'
 
     runtime 'org.codehaus.groovy:groovy:2.4.+'
+
+    // Jar that creates QRcodes
+    compile 'com.google.zxing:core:3.3.0'
 }
 
 
diff --git a/voting-booth/src/main/java/meerkat/voting/VotingBoothToyGraphicalRun.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/VotingBoothToyGraphicalRun.java
similarity index 98%
rename from voting-booth/src/main/java/meerkat/voting/VotingBoothToyGraphicalRun.java
rename to voting-booth-gui/src/main/java/meerkat/voting/gui/VotingBoothToyGraphicalRun.java
index 1879b9e..23881a6 100644
--- a/voting-booth/src/main/java/meerkat/voting/VotingBoothToyGraphicalRun.java
+++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/VotingBoothToyGraphicalRun.java
@@ -1,15 +1,16 @@
-package meerkat.voting;
+package meerkat.voting.gui;
 
 import com.google.protobuf.ByteString;
 import meerkat.crypto.DigitalSignature;
 import meerkat.crypto.Encryption;
 import meerkat.protobuf.Voting;
+import meerkat.voting.ToyEncryption;
+import meerkat.voting.ToySignature;
 import meerkat.voting.controller.VotingBoothImpl;
 import meerkat.voting.encryptor.VBCryptoManager;
 import meerkat.voting.encryptor.VBCryptoManagerImpl;
-import meerkat.voting.gui.ui.GraphicalUI;
-import meerkat.voting.output.FXWindowOutputDevice;
-import meerkat.voting.output.SystemConsoleOutputDevice;
+import meerkat.voting.gui.uiFX.GraphicalUI;
+import meerkat.voting.gui.output.FXWindowOutputDevice;
 import meerkat.voting.storage.StorageManager;
 import meerkat.voting.storage.StorageManagerMockup;
 
diff --git a/voting-booth/src/main/java/meerkat/voting/gui/ui/controllersFX/CastOrAuditController.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/controllersFX/CastOrAuditController.java
similarity index 68%
rename from voting-booth/src/main/java/meerkat/voting/gui/ui/controllersFX/CastOrAuditController.java
rename to voting-booth-gui/src/main/java/meerkat/voting/gui/controllersFX/CastOrAuditController.java
index 4d7c9da..6011f3a 100644
--- a/voting-booth/src/main/java/meerkat/voting/gui/ui/controllersFX/CastOrAuditController.java
+++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/controllersFX/CastOrAuditController.java
@@ -1,22 +1,8 @@
-package meerkat.voting.gui.ui.controllersFX;
+package meerkat.voting.gui.controllersFX;
 
 import javafx.fxml.FXML;
-import javafx.scene.control.ToggleGroup;
-import javafx.scene.layout.Pane;
-import javafx.scene.layout.VBox;
-import javafx.scene.text.Text;
-import meerkat.protobuf.Voting;
-import meerkat.voting.controller.callbacks.CastOrAuditCallback;
-import meerkat.voting.controller.callbacks.ControllerCallback;
-import meerkat.voting.controller.callbacks.VoterCancelThrowable;
-import meerkat.voting.gui.ui.UIUtils;
 import meerkat.voting.gui.ui.VotingBoothUI;
 import meerkat.voting.gui.ui.uicommands.CastOrAuditUICommand;
-import meerkat.voting.gui.ui.uicommands.RaceVotingUICommand;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 
 //import meerkat.voting.gui.ui.UIUtils;
 
diff --git a/voting-booth/src/main/java/meerkat/voting/gui/ui/controllersFX/ChannelChoiceController.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/controllersFX/ChannelChoiceController.java
similarity index 91%
rename from voting-booth/src/main/java/meerkat/voting/gui/ui/controllersFX/ChannelChoiceController.java
rename to voting-booth-gui/src/main/java/meerkat/voting/gui/controllersFX/ChannelChoiceController.java
index 647e795..08e4d2c 100644
--- a/voting-booth/src/main/java/meerkat/voting/gui/ui/controllersFX/ChannelChoiceController.java
+++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/controllersFX/ChannelChoiceController.java
@@ -1,11 +1,7 @@
-package meerkat.voting.gui.ui.controllersFX;
+package meerkat.voting.gui.controllersFX;
 
 import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.control.TextField;
-import javafx.scene.control.Toggle;
 import javafx.scene.control.ToggleGroup;
-import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Text;
@@ -14,9 +10,7 @@ import meerkat.voting.controller.callbacks.VoterCancelThrowable;
 //import meerkat.voting.gui.ui.UIUtils;
 import meerkat.voting.gui.ui.UIUtils;
 import meerkat.voting.gui.ui.uicommands.ChannelChoiceUICommand;
-import meerkat.voting.gui.ui.uicommands.UICommand;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/voting-booth/src/main/java/meerkat/voting/gui/ui/controllersFX/EmptyStartController.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/controllersFX/EmptyStartController.java
similarity index 90%
rename from voting-booth/src/main/java/meerkat/voting/gui/ui/controllersFX/EmptyStartController.java
rename to voting-booth-gui/src/main/java/meerkat/voting/gui/controllersFX/EmptyStartController.java
index ea6606a..b740cd2 100644
--- a/voting-booth/src/main/java/meerkat/voting/gui/ui/controllersFX/EmptyStartController.java
+++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/controllersFX/EmptyStartController.java
@@ -1,4 +1,4 @@
-package meerkat.voting.gui.ui.controllersFX;
+package meerkat.voting.gui.controllersFX;
 
 import javafx.fxml.FXML;
 import meerkat.voting.gui.ui.uicommands.StartSessionUICommand;
diff --git a/voting-booth/src/main/java/meerkat/voting/gui/ui/controllersFX/LoadingController.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/controllersFX/LoadingController.java
similarity index 90%
rename from voting-booth/src/main/java/meerkat/voting/gui/ui/controllersFX/LoadingController.java
rename to voting-booth-gui/src/main/java/meerkat/voting/gui/controllersFX/LoadingController.java
index 53af0f9..8227cf7 100644
--- a/voting-booth/src/main/java/meerkat/voting/gui/ui/controllersFX/LoadingController.java
+++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/controllersFX/LoadingController.java
@@ -1,4 +1,4 @@
-package meerkat.voting.gui.ui.controllersFX;
+package meerkat.voting.gui.controllersFX;
 
 /**
  * Created by Laura on 01/12/2017.
diff --git a/voting-booth/src/main/java/meerkat/voting/gui/ui/controllersFX/MainController.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/controllersFX/MainController.java
similarity index 96%
rename from voting-booth/src/main/java/meerkat/voting/gui/ui/controllersFX/MainController.java
rename to voting-booth-gui/src/main/java/meerkat/voting/gui/controllersFX/MainController.java
index 47e8388..e712fe5 100644
--- a/voting-booth/src/main/java/meerkat/voting/gui/ui/controllersFX/MainController.java
+++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/controllersFX/MainController.java
@@ -1,4 +1,4 @@
-package meerkat.voting.gui.ui.controllersFX;
+package meerkat.voting.gui.controllersFX;
 
 /**
  * Created by Laura on 12/16/2016.
diff --git a/voting-booth/src/main/java/meerkat/voting/gui/ui/controllersFX/PrinterController.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/controllersFX/PrinterController.java
similarity index 97%
rename from voting-booth/src/main/java/meerkat/voting/gui/ui/controllersFX/PrinterController.java
rename to voting-booth-gui/src/main/java/meerkat/voting/gui/controllersFX/PrinterController.java
index 99f3682..3916f22 100644
--- a/voting-booth/src/main/java/meerkat/voting/gui/ui/controllersFX/PrinterController.java
+++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/controllersFX/PrinterController.java
@@ -1,4 +1,4 @@
-package meerkat.voting.gui.ui.controllersFX;
+package meerkat.voting.gui.controllersFX;
 
 /**
  * Created by Laura on 01/12/2017.
diff --git a/voting-booth/src/main/java/meerkat/voting/gui/ui/controllersFX/VistaNavigator.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/controllersFX/VistaNavigator.java
similarity index 98%
rename from voting-booth/src/main/java/meerkat/voting/gui/ui/controllersFX/VistaNavigator.java
rename to voting-booth-gui/src/main/java/meerkat/voting/gui/controllersFX/VistaNavigator.java
index ef75eb1..e94efa6 100644
--- a/voting-booth/src/main/java/meerkat/voting/gui/ui/controllersFX/VistaNavigator.java
+++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/controllersFX/VistaNavigator.java
@@ -1,4 +1,4 @@
-package meerkat.voting.gui.ui.controllersFX;
+package meerkat.voting.gui.controllersFX;
 
 /**
  * Created by Laura on 12/16/2016.
@@ -6,7 +6,7 @@ package meerkat.voting.gui.ui.controllersFX;
 import javafx.application.Platform;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Node;
-import meerkat.voting.gui.ui.GraphicalUI;
+import meerkat.voting.gui.uiFX.GraphicalUI;
 import meerkat.voting.gui.ui.uicommands.UICommand;
 
 import java.awt.image.BufferedImage;
diff --git a/voting-booth/src/main/java/meerkat/voting/gui/ui/controllersFX/VotingController.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/controllersFX/VotingController.java
similarity index 96%
rename from voting-booth/src/main/java/meerkat/voting/gui/ui/controllersFX/VotingController.java
rename to voting-booth-gui/src/main/java/meerkat/voting/gui/controllersFX/VotingController.java
index 365d4a4..261a1f6 100644
--- a/voting-booth/src/main/java/meerkat/voting/gui/ui/controllersFX/VotingController.java
+++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/controllersFX/VotingController.java
@@ -1,4 +1,4 @@
-package meerkat.voting.gui.ui.controllersFX;
+package meerkat.voting.gui.controllersFX;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.ToggleGroup;
@@ -8,7 +8,6 @@ import javafx.scene.text.Text;
 import meerkat.protobuf.Voting;
 import meerkat.voting.controller.callbacks.VoterCancelThrowable;
 import meerkat.voting.gui.ui.UIUtils;
-import meerkat.voting.gui.ui.uicommands.ChannelChoiceUICommand;
 import meerkat.voting.gui.ui.uicommands.RaceVotingUICommand;
 
 import java.util.ArrayList;
diff --git a/voting-booth/src/main/java/meerkat/voting/gui/ui/controllersFX/WelcomeScreenController.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/controllersFX/WelcomeScreenController.java
similarity index 93%
rename from voting-booth/src/main/java/meerkat/voting/gui/ui/controllersFX/WelcomeScreenController.java
rename to voting-booth-gui/src/main/java/meerkat/voting/gui/controllersFX/WelcomeScreenController.java
index 72e2fcc..268c266 100644
--- a/voting-booth/src/main/java/meerkat/voting/gui/ui/controllersFX/WelcomeScreenController.java
+++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/controllersFX/WelcomeScreenController.java
@@ -1,4 +1,4 @@
-package meerkat.voting.gui.ui.controllersFX;
+package meerkat.voting.gui.controllersFX;
 
 import javafx.fxml.FXML;
 import meerkat.voting.gui.ui.uicommands.StartSessionUICommand;
diff --git a/voting-booth/src/main/java/meerkat/voting/output/FXWindowOutputDevice.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/output/FXWindowOutputDevice.java
similarity index 97%
rename from voting-booth/src/main/java/meerkat/voting/output/FXWindowOutputDevice.java
rename to voting-booth-gui/src/main/java/meerkat/voting/gui/output/FXWindowOutputDevice.java
index 6becf44..765fce5 100644
--- a/voting-booth/src/main/java/meerkat/voting/output/FXWindowOutputDevice.java
+++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/output/FXWindowOutputDevice.java
@@ -1,4 +1,4 @@
-package meerkat.voting.output;
+package meerkat.voting.gui.output;
 
 import com.google.protobuf.ByteString;
 import com.google.zxing.WriterException;
@@ -6,8 +6,8 @@ import meerkat.protobuf.Crypto.EncryptionRandomness;
 import meerkat.protobuf.Crypto.RandomnessGenerationProof;
 import meerkat.protobuf.Voting.BallotSecrets;
 import meerkat.protobuf.Voting.PlaintextBallot;
-import meerkat.protobuf.Voting.SignedEncryptedBallot;
-import meerkat.voting.gui.ui.controllersFX.VistaNavigator;
+import meerkat.voting.gui.controllersFX.VistaNavigator;
+import meerkat.voting.output.AsyncRunnableOutputDevice;
 import meerkat.voting.output.outputcommands.AuditOutputCommand;
 import meerkat.voting.output.outputcommands.CancelOutputCommand;
 import meerkat.voting.output.outputcommands.CastOutputCommand;
diff --git a/voting-booth/src/main/java/meerkat/voting/output/GenerateQRCode.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/output/GenerateQRCode.java
similarity index 98%
rename from voting-booth/src/main/java/meerkat/voting/output/GenerateQRCode.java
rename to voting-booth-gui/src/main/java/meerkat/voting/gui/output/GenerateQRCode.java
index bc46815..9dcd9d7 100644
--- a/voting-booth/src/main/java/meerkat/voting/output/GenerateQRCode.java
+++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/output/GenerateQRCode.java
@@ -1,4 +1,4 @@
-package meerkat.voting.output;
+package meerkat.voting.gui.output;
 
 /**
  * Created by Laura on 1/25/2017.
diff --git a/voting-booth/src/main/java/meerkat/voting/gui/ui/GraphicalUI.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/uiFX/GraphicalUI.java
similarity index 98%
rename from voting-booth/src/main/java/meerkat/voting/gui/ui/GraphicalUI.java
rename to voting-booth-gui/src/main/java/meerkat/voting/gui/uiFX/GraphicalUI.java
index f9eb1dc..e51dfd0 100644
--- a/voting-booth/src/main/java/meerkat/voting/gui/ui/GraphicalUI.java
+++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/uiFX/GraphicalUI.java
@@ -1,8 +1,7 @@
-package meerkat.voting.gui.ui;
+package meerkat.voting.gui.uiFX;
 
 import com.google.common.util.concurrent.FutureCallback;
 import javafx.application.Application;
-import javafx.fxml.FXML;
 import javafx.geometry.Insets;
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.ToggleGroup;
@@ -16,7 +15,11 @@ import meerkat.protobuf.Voting.BallotQuestion;
 import meerkat.protobuf.Voting.UIElement;
 import meerkat.protobuf.Voting.UIElementDataType;
 import meerkat.voting.controller.callbacks.*;
-import meerkat.voting.gui.ui.controllersFX.VistaNavigator;
+import meerkat.voting.gui.controllersFX.VistaNavigator;
+import meerkat.voting.gui.ui.CommandPend;
+import meerkat.voting.gui.ui.TickerTimerTask;
+import meerkat.voting.gui.ui.UIUtils;
+import meerkat.voting.gui.ui.VotingBoothUI;
 import meerkat.voting.gui.ui.uicommands.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/voting-booth-gui/src/main/java/meerkat/voting/gui/ui/GraphicalUserInterface.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/uiFX/GraphicalUserInterface.java
similarity index 98%
rename from voting-booth-gui/src/main/java/meerkat/voting/gui/ui/GraphicalUserInterface.java
rename to voting-booth-gui/src/main/java/meerkat/voting/gui/uiFX/GraphicalUserInterface.java
index e8847f6..efff367 100644
--- a/voting-booth-gui/src/main/java/meerkat/voting/gui/ui/GraphicalUserInterface.java
+++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/uiFX/GraphicalUserInterface.java
@@ -1,8 +1,10 @@
-package meerkat.voting.gui.ui;
+package meerkat.voting.gui.uiFX;
 
 import meerkat.voting.gui.managment.VotingBoothGUIManager;
 import meerkat.protobuf.Voting;
 import meerkat.voting.controller.callbacks.*;
+import meerkat.voting.gui.ui.CommandPend;
+import meerkat.voting.gui.ui.TickerTimerTask;
 import meerkat.voting.gui.ui.uicommands.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/voting-booth/src/main/java/meerkat/voting/gui/ui/MainFX.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/uiFX/MainFX.java
similarity index 92%
rename from voting-booth/src/main/java/meerkat/voting/gui/ui/MainFX.java
rename to voting-booth-gui/src/main/java/meerkat/voting/gui/uiFX/MainFX.java
index 0a67257..2585812 100644
--- a/voting-booth/src/main/java/meerkat/voting/gui/ui/MainFX.java
+++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/uiFX/MainFX.java
@@ -1,18 +1,16 @@
-package meerkat.voting.gui.ui;
+package meerkat.voting.gui.uiFX;
 
 /**
  * Created by Laura on 12/12/2016.
  */
 
 import javafx.application.Application;
-import javafx.geometry.Rectangle2D;
 import javafx.scene.Scene;
 import javafx.scene.layout.Pane;
-import javafx.stage.Screen;
 import javafx.stage.Stage;
-import meerkat.voting.gui.ui.controllersFX.MainController;
-import meerkat.voting.gui.ui.controllersFX.PrinterController;
-import meerkat.voting.gui.ui.controllersFX.VistaNavigator;
+import meerkat.voting.gui.controllersFX.MainController;
+import meerkat.voting.gui.controllersFX.PrinterController;
+import meerkat.voting.gui.controllersFX.VistaNavigator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import javafx.fxml.FXMLLoader;
diff --git a/voting-booth/src/main/resources/views/castOrAudit.fxml b/voting-booth-gui/src/main/resources/views/castOrAudit.fxml
similarity index 90%
rename from voting-booth/src/main/resources/views/castOrAudit.fxml
rename to voting-booth-gui/src/main/resources/views/castOrAudit.fxml
index b8e1362..81ebda4 100644
--- a/voting-booth/src/main/resources/views/castOrAudit.fxml
+++ b/voting-booth-gui/src/main/resources/views/castOrAudit.fxml
@@ -4,7 +4,7 @@
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.text.Text?>
 
-<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="meerkat.voting.gui.ui.controllersFX.CastOrAuditController">
+<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="meerkat.voting.gui.controllersFX.CastOrAuditController">
    <children>
       <Text fx:id="question" layoutX="84.0" layoutY="89.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Cast or Audit?" textAlignment="CENTER" wrappingWidth="431.3046875" />
       <Button layoutX="150.0" layoutY="200.0" mnemonicParsing="false" onMousePressed="#cast" prefHeight="50.0" prefWidth="90.0" text="Cast" />
diff --git a/voting-booth/src/main/resources/views/channel_choice.fxml b/voting-booth-gui/src/main/resources/views/channel_choice.fxml
similarity index 91%
rename from voting-booth/src/main/resources/views/channel_choice.fxml
rename to voting-booth-gui/src/main/resources/views/channel_choice.fxml
index 414592f..55981b5 100644
--- a/voting-booth/src/main/resources/views/channel_choice.fxml
+++ b/voting-booth-gui/src/main/resources/views/channel_choice.fxml
@@ -4,7 +4,7 @@
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.text.Text?>
 
-<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="meerkat.voting.gui.ui.controllersFX.ChannelChoiceController">
+<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="meerkat.voting.gui.controllersFX.ChannelChoiceController">
    <children>
       <Button layoutX="469.0" layoutY="343.0" mnemonicParsing="false" onMousePressed="#nextQuestion" text="Next" />
       <Text fx:id="question" layoutX="84.0" layoutY="89.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Click 'Next' to see the first question." wrappingWidth="431.3046875" />
diff --git a/voting-booth/src/main/resources/views/channel_choice_old.fxml b/voting-booth-gui/src/main/resources/views/channel_choice_old.fxml
similarity index 100%
rename from voting-booth/src/main/resources/views/channel_choice_old.fxml
rename to voting-booth-gui/src/main/resources/views/channel_choice_old.fxml
diff --git a/voting-booth/src/main/resources/views/empty_start.fxml b/voting-booth-gui/src/main/resources/views/empty_start.fxml
similarity index 98%
rename from voting-booth/src/main/resources/views/empty_start.fxml
rename to voting-booth-gui/src/main/resources/views/empty_start.fxml
index a26dc53..c955d6a 100644
--- a/voting-booth/src/main/resources/views/empty_start.fxml
+++ b/voting-booth-gui/src/main/resources/views/empty_start.fxml
@@ -7,7 +7,7 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.text.Font?>
 
-<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="meerkat.voting.gui.ui.controllersFX.EmptyStartController">
+<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="meerkat.voting.gui.controllersFX.EmptyStartController">
   <columnConstraints>
     <ColumnConstraints />
       <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
diff --git a/voting-booth/src/main/resources/views/loading.fxml b/voting-booth-gui/src/main/resources/views/loading.fxml
similarity index 83%
rename from voting-booth/src/main/resources/views/loading.fxml
rename to voting-booth-gui/src/main/resources/views/loading.fxml
index 868a424..db0a34c 100644
--- a/voting-booth/src/main/resources/views/loading.fxml
+++ b/voting-booth-gui/src/main/resources/views/loading.fxml
@@ -3,7 +3,7 @@
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.text.Text?>
 
-<StackPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="meerkat.voting.gui.ui.controllersFX.LoadingController">
+<StackPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="meerkat.voting.gui.controllersFX.LoadingController">
    <children>
       <Text fx:id="loading_text" strokeType="OUTSIDE" strokeWidth="0.0" text="Loading..." />
    </children>
diff --git a/voting-booth/src/main/resources/views/main.fxml b/voting-booth-gui/src/main/resources/views/main.fxml
similarity index 93%
rename from voting-booth/src/main/resources/views/main.fxml
rename to voting-booth-gui/src/main/resources/views/main.fxml
index 50028cf..049ee8a 100644
--- a/voting-booth/src/main/resources/views/main.fxml
+++ b/voting-booth-gui/src/main/resources/views/main.fxml
@@ -6,7 +6,7 @@
 <?import javafx.scene.layout.VBox?>
 <?scenebuilder-stylesheet vista.css?>
 
-<VBox prefHeight="709.0" prefWidth="1259.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="meerkat.voting.gui.ui.controllersFX.MainController">
+<VBox prefHeight="709.0" prefWidth="1259.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="meerkat.voting.gui.controllersFX.MainController">
     <children>
         <Label fx:id="headerLabel" maxWidth="1.7976931348623157E308" prefHeight="70.0" prefWidth="1162.0" text="Header of Election" textFill="#939090" VBox.vgrow="NEVER">
          <VBox.margin>
diff --git a/voting-booth/src/main/resources/views/printer.fxml b/voting-booth-gui/src/main/resources/views/printer.fxml
similarity index 87%
rename from voting-booth/src/main/resources/views/printer.fxml
rename to voting-booth-gui/src/main/resources/views/printer.fxml
index e79205e..aefb38a 100644
--- a/voting-booth/src/main/resources/views/printer.fxml
+++ b/voting-booth-gui/src/main/resources/views/printer.fxml
@@ -3,7 +3,7 @@
 <?import javafx.scene.layout.VBox?>
 <?scenebuilder-stylesheet vista.css?>
 
-<VBox fx:id="vBox" prefHeight="200.0" prefWidth="350.0" style="-fx-background-color: white;" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="meerkat.voting.gui.ui.controllersFX.PrinterController">
+<VBox fx:id="vBox" prefHeight="200.0" prefWidth="350.0" style="-fx-background-color: white;" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="meerkat.voting.gui.controllersFX.PrinterController">
     <children>
 
     </children>
diff --git a/voting-booth/src/main/resources/views/vista.css b/voting-booth-gui/src/main/resources/views/vista.css
similarity index 100%
rename from voting-booth/src/main/resources/views/vista.css
rename to voting-booth-gui/src/main/resources/views/vista.css
diff --git a/voting-booth/src/main/resources/views/voting.fxml b/voting-booth-gui/src/main/resources/views/voting.fxml
similarity index 92%
rename from voting-booth/src/main/resources/views/voting.fxml
rename to voting-booth-gui/src/main/resources/views/voting.fxml
index aec85ef..38789ea 100644
--- a/voting-booth/src/main/resources/views/voting.fxml
+++ b/voting-booth-gui/src/main/resources/views/voting.fxml
@@ -4,7 +4,7 @@
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.text.Text?>
 
-<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="meerkat.voting.gui.ui.controllersFX.VotingController">
+<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="meerkat.voting.gui.controllersFX.VotingController">
    <children>
       <Button layoutX="469.0" layoutY="343.0" mnemonicParsing="false" onMousePressed="#nextQuestion" text="Next" />
       <Text fx:id="question" layoutX="84.0" layoutY="89.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Click 'Next' to see the first question." wrappingWidth="431.3046875" />
diff --git a/voting-booth/src/main/resources/views/welcome_screen.fxml b/voting-booth-gui/src/main/resources/views/welcome_screen.fxml
similarity index 98%
rename from voting-booth/src/main/resources/views/welcome_screen.fxml
rename to voting-booth-gui/src/main/resources/views/welcome_screen.fxml
index 091c367..05b5069 100644
--- a/voting-booth/src/main/resources/views/welcome_screen.fxml
+++ b/voting-booth-gui/src/main/resources/views/welcome_screen.fxml
@@ -5,7 +5,7 @@
 <?import java.lang.*?>
 <?import javafx.scene.layout.*?>
 
-<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="meerkat.voting.gui.ui.controllersFX.WelcomeScreenController">
+<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="meerkat.voting.gui.controllersFX.WelcomeScreenController">
   <columnConstraints>
     <ColumnConstraints />
       <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
diff --git a/voting-booth/build.gradle b/voting-booth/build.gradle
index 2a2bcc2..0920359 100644
--- a/voting-booth/build.gradle
+++ b/voting-booth/build.gradle
@@ -54,10 +54,6 @@ dependencies {
     runtime 'ch.qos.logback:logback-classic:1.1.2'
     runtime 'ch.qos.logback:logback-core:1.1.2'
 
-    // Jar that creates barcodes
-    compile group: 'net.sourceforge.barbecue', name: 'barbecue', version: '1.5-beta1'
-    compile 'com.google.zxing:core:3.3.0'
-
     // Google protobufs
     compile 'com.google.protobuf:protobuf-java:3.+'
 
diff --git a/voting-booth/src/main/java/meerkat/voting/gui/ui/TickerTimerTask.java b/voting-booth/src/main/java/meerkat/voting/gui/ui/TickerTimerTask.java
index fd6a804..19d4931 100644
--- a/voting-booth/src/main/java/meerkat/voting/gui/ui/TickerTimerTask.java
+++ b/voting-booth/src/main/java/meerkat/voting/gui/ui/TickerTimerTask.java
@@ -8,7 +8,7 @@ import java.util.TimerTask;
 /**
  * A thread that sends the UI clock TickCommands in a given constant frequency
  */
-class TickerTimerTask extends TimerTask {
+public class TickerTimerTask extends TimerTask {
     private CommandPend<UICommand> cmdPend;
     public TickerTimerTask (CommandPend<UICommand> cmdPend) {
         this.cmdPend = cmdPend;
diff --git a/voting-booth/src/main/java/meerkat/voting/gui/ui/UIUtils.java b/voting-booth/src/main/java/meerkat/voting/gui/ui/UIUtils.java
index 7fea7ef..e8b4788 100644
--- a/voting-booth/src/main/java/meerkat/voting/gui/ui/UIUtils.java
+++ b/voting-booth/src/main/java/meerkat/voting/gui/ui/UIUtils.java
@@ -32,7 +32,7 @@ public class UIUtils {
      * @param question a ballot question to check
      * @return True if the question data is only text
      */
-    static boolean isQuestionOnlyText(Voting.BallotQuestion question) {
+    public static boolean isQuestionOnlyText(Voting.BallotQuestion question) {
         boolean isText = true;
         if (question.getQuestion().getType() != Voting.UIElementDataType.TEXT
                 || question.getDescription().getType() != Voting.UIElementDataType.TEXT) {
@@ -52,7 +52,7 @@ public class UIUtils {
      * @param questions list of the questions
      * @param logger logger to which writing logs
      */
-    static void assertQuestionsAreValid (List<Voting.BallotQuestion> questions,Logger logger) {
+    public static void assertQuestionsAreValid (List<Voting.BallotQuestion> questions,Logger logger) {
         for (int index = 0; index < questions.size(); ++index) {
             Voting.BallotQuestion question = questions.get(index);
             if (question.getIsMandatory()) {
@@ -73,7 +73,7 @@ public class UIUtils {
      * @param data string of data
      * @return data converted to ut8 str
      */
-    static String bytesToString(ByteString data) {
+    public static String bytesToString(ByteString data) {
         return data.toStringUtf8();
     }
 
diff --git a/voting-booth/src/main/java/meerkat/voting/output/AsyncRunnableOutputDevice.java b/voting-booth/src/main/java/meerkat/voting/output/AsyncRunnableOutputDevice.java
index e8acad6..916c75b 100644
--- a/voting-booth/src/main/java/meerkat/voting/output/AsyncRunnableOutputDevice.java
+++ b/voting-booth/src/main/java/meerkat/voting/output/AsyncRunnableOutputDevice.java
@@ -119,24 +119,24 @@ public abstract class AsyncRunnableOutputDevice implements BallotOutputDevice, R
      * This method should be filled by an extending class. It should have the details of how to commit to a ballot
      * @param command a CommitOutputCommand with the details and the callback
      */
-    abstract void doCommitToBallot(CommitOutputCommand command);
+    public abstract void doCommitToBallot(CommitOutputCommand command);
 
     /**
      * This method should be filled by an extending class. It should have the details of how to audit the ballot
      * @param command a AuditOutputCommand with the details and the callback
      */
-    abstract void doAudit(AuditOutputCommand command);
+    public abstract void doAudit(AuditOutputCommand command);
 
     /**
      * This method should be filled by an extending class. It should have the details of how to cast the ballot
      * @param command a CastOutputCommand with the details and the callback
      */
-    abstract void doCastBallot(CastOutputCommand command);
+    public abstract void doCastBallot(CastOutputCommand command);
 
     /**
      * This method should be filled by an extending class. It should have the details of how to cancel the ballot output
      * @param command a CancelOutputCommand with the details and the callback
      */
-    abstract void doCancel(CancelOutputCommand command);
+    public abstract void doCancel(CancelOutputCommand command);
 
 }