diff --git a/classes/production/voting-booth-gui/main/ChainBuilder.class b/classes/production/voting-booth-gui/main/ChainBuilder.class
deleted file mode 100644
index db2922b..0000000
Binary files a/classes/production/voting-booth-gui/main/ChainBuilder.class and /dev/null differ
diff --git a/classes/production/voting-booth-gui/main/Main.class b/classes/production/voting-booth-gui/main/Main.class
deleted file mode 100644
index c8dc67e..0000000
Binary files a/classes/production/voting-booth-gui/main/Main.class and /dev/null differ
diff --git a/classes/production/voting-booth-gui/main/TwoWayNode.class b/classes/production/voting-booth-gui/main/TwoWayNode.class
deleted file mode 100644
index e556ffa..0000000
Binary files a/classes/production/voting-booth-gui/main/TwoWayNode.class and /dev/null differ
diff --git a/classes/production/voting-booth-gui/main/VotingBoothGUIManager.class b/classes/production/voting-booth-gui/main/VotingBoothGUIManager.class
deleted file mode 100644
index fc91a8f..0000000
Binary files a/classes/production/voting-booth-gui/main/VotingBoothGUIManager.class and /dev/null differ
diff --git a/classes/production/voting-booth-gui/main/ballot_summary/BallotSummaryController.class b/classes/production/voting-booth-gui/main/ballot_summary/BallotSummaryController.class
deleted file mode 100644
index fda60f0..0000000
Binary files a/classes/production/voting-booth-gui/main/ballot_summary/BallotSummaryController.class and /dev/null differ
diff --git a/classes/production/voting-booth-gui/main/ballot_summary/BallotSummaryLoader.class b/classes/production/voting-booth-gui/main/ballot_summary/BallotSummaryLoader.class
deleted file mode 100644
index 0e62250..0000000
Binary files a/classes/production/voting-booth-gui/main/ballot_summary/BallotSummaryLoader.class and /dev/null differ
diff --git a/classes/production/voting-booth-gui/main/cast_or_audit/CastOrAuditController.class b/classes/production/voting-booth-gui/main/cast_or_audit/CastOrAuditController.class
deleted file mode 100644
index 850d271..0000000
Binary files a/classes/production/voting-booth-gui/main/cast_or_audit/CastOrAuditController.class and /dev/null differ
diff --git a/classes/production/voting-booth-gui/main/cast_or_audit/CastOrAuditLoader.class b/classes/production/voting-booth-gui/main/cast_or_audit/CastOrAuditLoader.class
deleted file mode 100644
index a23f44a..0000000
Binary files a/classes/production/voting-booth-gui/main/cast_or_audit/CastOrAuditLoader.class and /dev/null differ
diff --git a/classes/production/voting-booth-gui/main/select_candidate_by_picture/SelectCandidateByPictureController.class b/classes/production/voting-booth-gui/main/select_candidate_by_picture/SelectCandidateByPictureController.class
deleted file mode 100644
index 7560494..0000000
Binary files a/classes/production/voting-booth-gui/main/select_candidate_by_picture/SelectCandidateByPictureController.class and /dev/null differ
diff --git a/classes/production/voting-booth-gui/main/select_candidate_by_picture/SelectCandidateByPictureLoader.class b/classes/production/voting-booth-gui/main/select_candidate_by_picture/SelectCandidateByPictureLoader.class
deleted file mode 100644
index f2384e5..0000000
Binary files a/classes/production/voting-booth-gui/main/select_candidate_by_picture/SelectCandidateByPictureLoader.class and /dev/null differ
diff --git a/classes/production/voting-booth-gui/main/select_candidate_by_picture/select_candidate_by_picture.fxml b/classes/production/voting-booth-gui/main/select_candidate_by_picture/select_candidate_by_picture.fxml
deleted file mode 100644
index 887fd6e..0000000
--- a/classes/production/voting-booth-gui/main/select_candidate_by_picture/select_candidate_by_picture.fxml
+++ /dev/null
@@ -1,220 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/classes/production/voting-booth-gui/main/select_candidate_name/SelectCandidateNameController.class b/classes/production/voting-booth-gui/main/select_candidate_name/SelectCandidateNameController.class
deleted file mode 100644
index b7d0818..0000000
Binary files a/classes/production/voting-booth-gui/main/select_candidate_name/SelectCandidateNameController.class and /dev/null differ
diff --git a/classes/production/voting-booth-gui/main/select_candidate_name/SelectCandidateNameLoader.class b/classes/production/voting-booth-gui/main/select_candidate_name/SelectCandidateNameLoader.class
deleted file mode 100644
index 6aeae42..0000000
Binary files a/classes/production/voting-booth-gui/main/select_candidate_name/SelectCandidateNameLoader.class and /dev/null differ
diff --git a/classes/production/voting-booth-gui/main/select_candidate_name/select_candidate_name.fxml b/classes/production/voting-booth-gui/main/select_candidate_name/select_candidate_name.fxml
deleted file mode 100644
index 288e463..0000000
--- a/classes/production/voting-booth-gui/main/select_candidate_name/select_candidate_name.fxml
+++ /dev/null
@@ -1,245 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/classes/production/voting-booth-gui/main/straight_channel_section/StraightChannelSectionController.class b/classes/production/voting-booth-gui/main/straight_channel_section/StraightChannelSectionController.class
deleted file mode 100644
index efec09c..0000000
Binary files a/classes/production/voting-booth-gui/main/straight_channel_section/StraightChannelSectionController.class and /dev/null differ
diff --git a/classes/production/voting-booth-gui/main/straight_channel_section/StraightChannelSectionLoader.class b/classes/production/voting-booth-gui/main/straight_channel_section/StraightChannelSectionLoader.class
deleted file mode 100644
index a512716..0000000
Binary files a/classes/production/voting-booth-gui/main/straight_channel_section/StraightChannelSectionLoader.class and /dev/null differ
diff --git a/classes/production/voting-booth-gui/main/vote_have_been_cast/VoteHaveBeenCastController.class b/classes/production/voting-booth-gui/main/vote_have_been_cast/VoteHaveBeenCastController.class
deleted file mode 100644
index 31fb7c1..0000000
Binary files a/classes/production/voting-booth-gui/main/vote_have_been_cast/VoteHaveBeenCastController.class and /dev/null differ
diff --git a/classes/production/voting-booth-gui/main/vote_have_been_cast/VoteHaveBeenCastLoader.class b/classes/production/voting-booth-gui/main/vote_have_been_cast/VoteHaveBeenCastLoader.class
deleted file mode 100644
index 318e3de..0000000
Binary files a/classes/production/voting-booth-gui/main/vote_have_been_cast/VoteHaveBeenCastLoader.class and /dev/null differ
diff --git a/classes/production/voting-booth-gui/main/welcome_splash/WelcomeSplashController.class b/classes/production/voting-booth-gui/main/welcome_splash/WelcomeSplashController.class
deleted file mode 100644
index c217cd6..0000000
Binary files a/classes/production/voting-booth-gui/main/welcome_splash/WelcomeSplashController.class and /dev/null differ
diff --git a/classes/production/voting-booth-gui/main/welcome_splash/WelcomeSplashLoader.class b/classes/production/voting-booth-gui/main/welcome_splash/WelcomeSplashLoader.class
deleted file mode 100644
index b3007c8..0000000
Binary files a/classes/production/voting-booth-gui/main/welcome_splash/WelcomeSplashLoader.class and /dev/null differ
diff --git a/classes/production/voting-booth-gui/main/welcome_splash/welcome_splash_screen.fxml b/classes/production/voting-booth-gui/main/welcome_splash/welcome_splash_screen.fxml
deleted file mode 100644
index 0c3d611..0000000
--- a/classes/production/voting-booth-gui/main/welcome_splash/welcome_splash_screen.fxml
+++ /dev/null
@@ -1,99 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/settings.gradle b/settings.gradle
index 542a831..8401a04 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,3 +6,4 @@ include 'restful-api-common'
include 'mixer'
include 'bulletin-board-client'
include 'distributed-key-generation'
+include 'voting-booth-gui'
diff --git a/voting-booth-gui/build.gradle b/voting-booth-gui/build.gradle
new file mode 100644
index 0000000..0a74494
--- /dev/null
+++ b/voting-booth-gui/build.gradle
@@ -0,0 +1,223 @@
+
+plugins {
+ id "us.kirchmeier.capsule" version "1.0.2"
+ id 'com.google.protobuf' version '0.8.0'
+}
+
+apply plugin: 'java'
+apply plugin: 'eclipse'
+apply plugin: 'idea'
+
+apply plugin: 'maven-publish'
+
+// Uncomment the lines below to define an application
+// (this will also allow you to build a "fatCapsule" which includes
+// the entire application, including all dependencies in a single jar)
+apply plugin: 'application'
+mainClassName='meerkat.voting.gui.Main'
+
+// Is this a snapshot version?
+ext { isSnapshot = false }
+
+ext {
+ groupId = 'org.factcenter.meerkat'
+ nexusRepository = "https://cs.idc.ac.il/nexus/content/groups/${isSnapshot ? 'unstable' : 'public'}/"
+
+ // Credentials for IDC nexus repositories (needed only for using unstable repositories and publishing)
+ // Should be set in ${HOME}/.gradle/gradle.properties
+ nexusUser = project.hasProperty('nexusUser') ? project.property('nexusUser') : ""
+ nexusPassword = project.hasProperty('nexusPassword') ? project.property('nexusPassword') : ""
+}
+
+description = "GUI for voting booth"
+
+// Your project version
+version = "0.1"
+
+version += "${isSnapshot ? '-SNAPSHOT' : ''}"
+
+
+
+dependencies {
+ // Meerkat common
+ compile project(':meerkat-common')
+ compile project(':voting-booth')
+
+
+ // Logging
+ compile 'org.slf4j:slf4j-api:1.7.7'
+ runtime 'ch.qos.logback:logback-classic:1.1.2'
+ runtime 'ch.qos.logback:logback-core:1.1.2'
+
+ // Google protobufs
+ compile 'com.google.protobuf:protobuf-java:3.+'
+
+ testCompile 'junit:junit:4.+'
+
+ runtime 'org.codehaus.groovy:groovy:2.4.+'
+}
+
+
+/*==== You probably don't have to edit below this line =======*/
+
+// Setup test configuration that can appear as a dependency in
+// other subprojects
+configurations {
+ testOutput.extendsFrom (testCompile)
+}
+
+task testJar(type: Jar, dependsOn: testClasses) {
+ classifier = 'tests'
+ from sourceSets.test.output
+}
+
+artifacts {
+ testOutput testJar
+}
+
+// The run task added by the application plugin
+// is also of type JavaExec.
+tasks.withType(JavaExec) {
+ // Assign all Java system properties from
+ // the command line to the JavaExec task.
+ systemProperties System.properties
+}
+
+
+protobuf {
+ // Configure the protoc executable
+ protoc {
+ // Download from repositories
+ artifact = 'com.google.protobuf:protoc:3.+'
+ }
+}
+
+
+idea {
+ module {
+ project.sourceSets.each { sourceSet ->
+
+ def srcDir = "${protobuf.generatedFilesBaseDir}/$sourceSet.name/java"
+
+ println "Adding $srcDir"
+ // add protobuf generated sources to generated source dir.
+ if ("test".equals(sourceSet.name)) {
+ testSourceDirs += file(srcDir)
+ } else {
+ sourceDirs += file(srcDir)
+ }
+ generatedSourceDirs += file(srcDir)
+
+ }
+
+ // Don't exclude build directory
+ excludeDirs -= file(buildDir)
+ }
+}
+
+
+/*===================================
+ * "Fat" Build targets
+ *===================================*/
+
+
+if (project.hasProperty('mainClassName') && (mainClassName != null)) {
+
+ task mavenCapsule(type: MavenCapsule) {
+ description = "Generate a capsule jar that automatically downloads and caches dependencies when run."
+ applicationClass mainClassName
+ destinationDir = buildDir
+ }
+
+ task fatCapsule(type: FatCapsule) {
+ description = "Generate a single capsule jar containing everything. Use -Pfatmain=... to override main class"
+
+ destinationDir = buildDir
+
+ def fatMain = hasProperty('fatmain') ? fatmain : mainClassName
+
+ applicationClass fatMain
+
+ def testJar = hasProperty('test')
+
+ if (hasProperty('fatmain')) {
+ appendix = "fat-${fatMain}"
+ } else {
+ appendix = "fat"
+ }
+
+ if (testJar) {
+ from sourceSets.test.output
+ }
+ }
+}
+
+
+/*===================================
+ * Repositories
+ *===================================*/
+
+repositories {
+
+ // Prefer the local nexus repository (it may have 3rd party artifacts not found in mavenCentral)
+ maven {
+ url nexusRepository
+
+ if (isSnapshot) {
+ credentials { username
+ password
+
+ username nexusUser
+ password nexusPassword
+ }
+ }
+ }
+
+ // Use local maven repository
+ mavenLocal()
+
+ // Use 'maven central' for other dependencies.
+ mavenCentral()
+}
+
+task "info" << {
+ println "Project: ${project.name}"
+println "Description: ${project.description}"
+ println "--------------------------"
+ println "GroupId: $groupId"
+ println "Version: $version (${isSnapshot ? 'snapshot' : 'release'})"
+ println ""
+}
+info.description 'Print some information about project parameters'
+
+
+/*===================================
+ * Publishing
+ *===================================*/
+
+publishing {
+ publications {
+ mavenJava(MavenPublication) {
+ groupId project.groupId
+ pom.withXml {
+ asNode().appendNode('description', project.description)
+ }
+ from project.components.java
+
+ }
+ }
+ repositories {
+ maven {
+ url "https://cs.idc.ac.il/nexus/content/repositories/${project.isSnapshot ? 'snapshots' : 'releases'}"
+ credentials { username
+ password
+
+ username nexusUser
+ password nexusPassword
+ }
+ }
+ }
+}
+
+
+
diff --git a/voting-booth-gui/gradlew b/voting-booth-gui/gradlew
new file mode 120000
index 0000000..502f5a2
--- /dev/null
+++ b/voting-booth-gui/gradlew
@@ -0,0 +1 @@
+../gradlew
\ No newline at end of file
diff --git a/voting-booth-gui/src/main/ballot_summary/ballot_summary.fxml b/voting-booth-gui/src/main/ballot_summary/ballot_summary.fxml
deleted file mode 100644
index e9d84d6..0000000
--- a/voting-booth-gui/src/main/ballot_summary/ballot_summary.fxml
+++ /dev/null
@@ -1,287 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/voting-booth-gui/src/main/cast_or_audit/cast_or_audit.fxml b/voting-booth-gui/src/main/cast_or_audit/cast_or_audit.fxml
deleted file mode 100644
index 5d4a586..0000000
--- a/voting-booth-gui/src/main/cast_or_audit/cast_or_audit.fxml
+++ /dev/null
@@ -1,260 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/voting-booth-gui/src/main/ChainBuilder.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/ChainBuilder.java
similarity index 89%
rename from voting-booth-gui/src/main/ChainBuilder.java
rename to voting-booth-gui/src/main/java/meerkat/voting/gui/ChainBuilder.java
index d1834aa..30932c9 100644
--- a/voting-booth-gui/src/main/ChainBuilder.java
+++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/ChainBuilder.java
@@ -1,13 +1,13 @@
-package main;
+package meerkat.voting.gui;
import javafx.stage.Stage;
-import main.ballot_summary.BallotSummaryLoader;
-import main.cast_or_audit.CastOrAuditLoader;
-import main.select_candidate_by_picture.SelectCandidateByPictureLoader;
-import main.select_candidate_name.SelectCandidateNameLoader;
-import main.straight_channel_section.StraightChannelSectionLoader;
-import main.vote_have_been_cast.VoteHaveBeenCastLoader;
-import main.welcome_splash.WelcomeSplashLoader;
+import meerkat.voting.gui.ballot_summary.BallotSummaryLoader;
+import meerkat.voting.gui.cast_or_audit.CastOrAuditLoader;
+import meerkat.voting.gui.select_candidate_by_picture.SelectCandidateByPictureLoader;
+import meerkat.voting.gui.select_candidate_name.SelectCandidateNameLoader;
+import meerkat.voting.gui.straight_channel_section.StraightChannelSectionLoader;
+import meerkat.voting.gui.vote_have_been_cast.VoteHaveBeenCastLoader;
+import meerkat.voting.gui.welcome_splash.WelcomeSplashLoader;
import java.io.IOException;
import java.util.HashMap;
diff --git a/voting-booth-gui/src/main/Main.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/Main.java
similarity index 95%
rename from voting-booth-gui/src/main/Main.java
rename to voting-booth-gui/src/main/java/meerkat/voting/gui/Main.java
index 41a4c6e..3035b47 100644
--- a/voting-booth-gui/src/main/Main.java
+++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/Main.java
@@ -1,4 +1,4 @@
-package main;
+package meerkat.voting.gui;
import javafx.application.Application;
import javafx.stage.Stage;
diff --git a/voting-booth-gui/src/main/TwoWayNode.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/TwoWayNode.java
similarity index 97%
rename from voting-booth-gui/src/main/TwoWayNode.java
rename to voting-booth-gui/src/main/java/meerkat/voting/gui/TwoWayNode.java
index cbf12cc..897f213 100644
--- a/voting-booth-gui/src/main/TwoWayNode.java
+++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/TwoWayNode.java
@@ -1,4 +1,4 @@
-package main;
+package meerkat.voting.gui;
import javafx.scene.Parent;
import javafx.scene.Scene;
diff --git a/voting-booth-gui/src/main/VotingBoothGUIManager.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/VotingBoothGUIManager.java
similarity index 99%
rename from voting-booth-gui/src/main/VotingBoothGUIManager.java
rename to voting-booth-gui/src/main/java/meerkat/voting/gui/VotingBoothGUIManager.java
index 0f69099..7ae33a3 100644
--- a/voting-booth-gui/src/main/VotingBoothGUIManager.java
+++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/VotingBoothGUIManager.java
@@ -1,4 +1,4 @@
-package main;
+package meerkat.voting.gui;
import com.google.common.util.concurrent.FutureCallback;
import javafx.application.Application;
diff --git a/voting-booth-gui/src/main/ballot_summary/BallotSummaryController.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/ballot_summary/BallotSummaryController.java
similarity index 88%
rename from voting-booth-gui/src/main/ballot_summary/BallotSummaryController.java
rename to voting-booth-gui/src/main/java/meerkat/voting/gui/ballot_summary/BallotSummaryController.java
index daf9977..9c46379 100644
--- a/voting-booth-gui/src/main/ballot_summary/BallotSummaryController.java
+++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/ballot_summary/BallotSummaryController.java
@@ -1,8 +1,8 @@
-package main.ballot_summary;
+package meerkat.voting.gui.ballot_summary;
import javafx.fxml.FXML;
import javafx.scene.input.MouseEvent;
-import main.TwoWayNode;
+import meerkat.voting.gui.TwoWayNode;
/**
* Created by Vladimir Eliezer Tokarev on 8/27/2016.
diff --git a/voting-booth-gui/src/main/ballot_summary/BallotSummaryLoader.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/ballot_summary/BallotSummaryLoader.java
similarity index 83%
rename from voting-booth-gui/src/main/ballot_summary/BallotSummaryLoader.java
rename to voting-booth-gui/src/main/java/meerkat/voting/gui/ballot_summary/BallotSummaryLoader.java
index 55eba17..928b015 100644
--- a/voting-booth-gui/src/main/ballot_summary/BallotSummaryLoader.java
+++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/ballot_summary/BallotSummaryLoader.java
@@ -1,10 +1,9 @@
-package main.ballot_summary;
+package meerkat.voting.gui.ballot_summary;
import javafx.fxml.FXMLLoader;
import javafx.scene.Parent;
import javafx.stage.Stage;
-import main.TwoWayNode;
-import main.select_candidate_by_picture.SelectCandidateByPictureController;
+import meerkat.voting.gui.TwoWayNode;
import java.io.IOException;
@@ -13,7 +12,7 @@ import java.io.IOException;
* BallotSummaryLoader gives the option to whatch summary of voter actions
*/
public class BallotSummaryLoader {
- private static final String BALLOT_SUMMARY_FXML_PATH = "ballot_summary.fxml";
+ private static final String BALLOT_SUMMARY_FXML_PATH = "/view/ballot_summary.fxml";
private Stage currentStage;
private FXMLLoader fxmlLoader;
diff --git a/voting-booth-gui/src/main/cast_or_audit/CastOrAuditController.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/cast_or_audit/CastOrAuditController.java
similarity index 84%
rename from voting-booth-gui/src/main/cast_or_audit/CastOrAuditController.java
rename to voting-booth-gui/src/main/java/meerkat/voting/gui/cast_or_audit/CastOrAuditController.java
index e7aecae..8a8c9d9 100644
--- a/voting-booth-gui/src/main/cast_or_audit/CastOrAuditController.java
+++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/cast_or_audit/CastOrAuditController.java
@@ -1,8 +1,8 @@
-package main.cast_or_audit;
+package meerkat.voting.gui.cast_or_audit;
import javafx.fxml.FXML;
import javafx.scene.input.MouseEvent;
-import main.TwoWayNode;
+import meerkat.voting.gui.TwoWayNode;
/**
* Created by Vladimir Eliezer Tokarev on 8/27/2016.
diff --git a/voting-booth-gui/src/main/cast_or_audit/CastOrAuditLoader.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/cast_or_audit/CastOrAuditLoader.java
similarity index 85%
rename from voting-booth-gui/src/main/cast_or_audit/CastOrAuditLoader.java
rename to voting-booth-gui/src/main/java/meerkat/voting/gui/cast_or_audit/CastOrAuditLoader.java
index b93c0e0..fdab41f 100644
--- a/voting-booth-gui/src/main/cast_or_audit/CastOrAuditLoader.java
+++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/cast_or_audit/CastOrAuditLoader.java
@@ -1,10 +1,9 @@
-package main.cast_or_audit;
+package meerkat.voting.gui.cast_or_audit;
import javafx.fxml.FXMLLoader;
import javafx.scene.Parent;
import javafx.stage.Stage;
-import main.TwoWayNode;
-import main.ballot_summary.BallotSummaryController;
+import meerkat.voting.gui.TwoWayNode;
import java.io.IOException;
@@ -13,7 +12,7 @@ import java.io.IOException;
* CastOrAuditLoader creates starlight channel section object and sets its controller
*/
public class CastOrAuditLoader {
- private static final String CAST_OR_AUDIT_FXML_PATH = "cast_or_audit.fxml";
+ private static final String CAST_OR_AUDIT_FXML_PATH = "/view/cast_or_audit.fxml";
private Stage currentStage;
private FXMLLoader fxmlLoader;
diff --git a/voting-booth-gui/src/main/select_candidate_by_picture/SelectCandidateByPictureController.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_by_picture/SelectCandidateByPictureController.java
similarity index 87%
rename from voting-booth-gui/src/main/select_candidate_by_picture/SelectCandidateByPictureController.java
rename to voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_by_picture/SelectCandidateByPictureController.java
index bed0e8a..9581f5a 100644
--- a/voting-booth-gui/src/main/select_candidate_by_picture/SelectCandidateByPictureController.java
+++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_by_picture/SelectCandidateByPictureController.java
@@ -1,8 +1,8 @@
-package main.select_candidate_by_picture;
+package meerkat.voting.gui.select_candidate_by_picture;
import javafx.fxml.FXML;
import javafx.scene.input.MouseEvent;
-import main.TwoWayNode;
+import meerkat.voting.gui.TwoWayNode;
/**
* Created by Vladimir Eliezer Tokarev on 8/27/2016.
diff --git a/voting-booth-gui/src/main/select_candidate_by_picture/SelectCandidateByPictureLoader.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_by_picture/SelectCandidateByPictureLoader.java
similarity index 87%
rename from voting-booth-gui/src/main/select_candidate_by_picture/SelectCandidateByPictureLoader.java
rename to voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_by_picture/SelectCandidateByPictureLoader.java
index 500cc70..43892e5 100644
--- a/voting-booth-gui/src/main/select_candidate_by_picture/SelectCandidateByPictureLoader.java
+++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_by_picture/SelectCandidateByPictureLoader.java
@@ -1,10 +1,9 @@
-package main.select_candidate_by_picture;
+package meerkat.voting.gui.select_candidate_by_picture;
import javafx.fxml.FXMLLoader;
import javafx.scene.Parent;
import javafx.stage.Stage;
-import main.TwoWayNode;
-import main.select_candidate_name.SelectCandidateNameController;
+import meerkat.voting.gui.TwoWayNode;
import java.io.IOException;
@@ -14,7 +13,7 @@ import java.io.IOException;
*/
public class SelectCandidateByPictureLoader {
- private static final String SELECT_CANDIDATE_BY_PICTURE_FXML_PATH = "select_candidate_by_picture.fxml";
+ private static final String SELECT_CANDIDATE_BY_PICTURE_FXML_PATH = "/view/select_candidate_by_picture.fxml";
private Stage currentStage;
private FXMLLoader fxmlLoader;
diff --git a/voting-booth-gui/src/main/select_candidate_name/SelectCandidateNameController.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_name/SelectCandidateNameController.java
similarity index 88%
rename from voting-booth-gui/src/main/select_candidate_name/SelectCandidateNameController.java
rename to voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_name/SelectCandidateNameController.java
index 69e91da..e352c33 100644
--- a/voting-booth-gui/src/main/select_candidate_name/SelectCandidateNameController.java
+++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_name/SelectCandidateNameController.java
@@ -1,9 +1,9 @@
-package main.select_candidate_name;
+package meerkat.voting.gui.select_candidate_name;
import javafx.fxml.FXML;
import javafx.scene.Scene;
import javafx.scene.input.MouseEvent;
-import main.TwoWayNode;
+import meerkat.voting.gui.TwoWayNode;
/**
* Created by Vladimir Eliezer Tokarev on 8/27/2016.
diff --git a/voting-booth-gui/src/main/select_candidate_name/SelectCandidateNameLoader.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_name/SelectCandidateNameLoader.java
similarity index 90%
rename from voting-booth-gui/src/main/select_candidate_name/SelectCandidateNameLoader.java
rename to voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_name/SelectCandidateNameLoader.java
index 47a0948..b1b30f8 100644
--- a/voting-booth-gui/src/main/select_candidate_name/SelectCandidateNameLoader.java
+++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_name/SelectCandidateNameLoader.java
@@ -1,9 +1,10 @@
-package main.select_candidate_name;
+package meerkat.voting.gui.select_candidate_name;
import javafx.fxml.FXMLLoader;
import javafx.scene.Parent;
import javafx.stage.Stage;
-import main.TwoWayNode;
+import meerkat.voting.gui.TwoWayNode;
+
import java.io.IOException;
/**
@@ -11,7 +12,7 @@ import java.io.IOException;
* SelectCandidateNameLoader creates the option to choose by name
*/
public class SelectCandidateNameLoader {
- private static final String SELECT_CANDIDATE_NAME_FXML_PATH = "select_candidate_name.fxml";
+ private static final String SELECT_CANDIDATE_NAME_FXML_PATH = "/view/select_candidate_name.fxml";
private Stage currentStage;
private FXMLLoader fxmlLoader;
diff --git a/voting-booth-gui/src/main/straight_channel_section/StraightChannelSectionController.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/straight_channel_section/StraightChannelSectionController.java
similarity index 86%
rename from voting-booth-gui/src/main/straight_channel_section/StraightChannelSectionController.java
rename to voting-booth-gui/src/main/java/meerkat/voting/gui/straight_channel_section/StraightChannelSectionController.java
index 93ec0e4..bcd77f2 100644
--- a/voting-booth-gui/src/main/straight_channel_section/StraightChannelSectionController.java
+++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/straight_channel_section/StraightChannelSectionController.java
@@ -1,11 +1,11 @@
-package main.straight_channel_section;
+package meerkat.voting.gui.straight_channel_section;
import javafx.fxml.FXML;
import javafx.scene.Parent;
import javafx.scene.Scene;
import javafx.scene.input.MouseEvent;
import javafx.stage.Stage;
-import main.TwoWayNode;
+import meerkat.voting.gui.TwoWayNode;
/**
* Created by Vladimir Eliezer Tokarev on 8/27/2016.
diff --git a/voting-booth-gui/src/main/straight_channel_section/StraightChannelSectionLoader.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/straight_channel_section/StraightChannelSectionLoader.java
similarity index 90%
rename from voting-booth-gui/src/main/straight_channel_section/StraightChannelSectionLoader.java
rename to voting-booth-gui/src/main/java/meerkat/voting/gui/straight_channel_section/StraightChannelSectionLoader.java
index 5580344..c8c73d7 100644
--- a/voting-booth-gui/src/main/straight_channel_section/StraightChannelSectionLoader.java
+++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/straight_channel_section/StraightChannelSectionLoader.java
@@ -1,9 +1,9 @@
-package main.straight_channel_section;
+package meerkat.voting.gui.straight_channel_section;
import javafx.fxml.FXMLLoader;
import javafx.scene.Parent;
import javafx.stage.Stage;
-import main.TwoWayNode;
+import meerkat.voting.gui.TwoWayNode;
import java.io.IOException;
@@ -12,7 +12,7 @@ import java.io.IOException;
* StraightChannelSectionLoader creates starlight channel section object and sets its controller
*/
public class StraightChannelSectionLoader {
- private static final String STRAIGHT_CHANNEL_LOADER_FXML_PATH = "straight_channel_section.fxml";
+ private static final String STRAIGHT_CHANNEL_LOADER_FXML_PATH = "/view/straight_channel_section.fxml";
private Stage currentStage;
private FXMLLoader fxmlLoader;
diff --git a/voting-booth-gui/src/main/vote_have_been_cast/VoteHaveBeenCastController.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/vote_have_been_cast/VoteHaveBeenCastController.java
similarity index 70%
rename from voting-booth-gui/src/main/vote_have_been_cast/VoteHaveBeenCastController.java
rename to voting-booth-gui/src/main/java/meerkat/voting/gui/vote_have_been_cast/VoteHaveBeenCastController.java
index 42ef459..5680048 100644
--- a/voting-booth-gui/src/main/vote_have_been_cast/VoteHaveBeenCastController.java
+++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/vote_have_been_cast/VoteHaveBeenCastController.java
@@ -1,6 +1,6 @@
-package main.vote_have_been_cast;
+package meerkat.voting.gui.vote_have_been_cast;
-import main.TwoWayNode;
+import meerkat.voting.gui.TwoWayNode;
/**
* Created by Vladimir Eliezer Tokarev on 8/27/2016.
diff --git a/voting-booth-gui/src/main/vote_have_been_cast/VoteHaveBeenCastLoader.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/vote_have_been_cast/VoteHaveBeenCastLoader.java
similarity index 89%
rename from voting-booth-gui/src/main/vote_have_been_cast/VoteHaveBeenCastLoader.java
rename to voting-booth-gui/src/main/java/meerkat/voting/gui/vote_have_been_cast/VoteHaveBeenCastLoader.java
index 956541d..fa00f57 100644
--- a/voting-booth-gui/src/main/vote_have_been_cast/VoteHaveBeenCastLoader.java
+++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/vote_have_been_cast/VoteHaveBeenCastLoader.java
@@ -1,10 +1,9 @@
-package main.vote_have_been_cast;
+package meerkat.voting.gui.vote_have_been_cast;
import javafx.fxml.FXMLLoader;
import javafx.scene.Parent;
import javafx.stage.Stage;
-import main.TwoWayNode;
-import main.cast_or_audit.CastOrAuditController;
+import meerkat.voting.gui.TwoWayNode;
import java.io.IOException;
@@ -13,7 +12,7 @@ import java.io.IOException;
* VoteHaveBeenCastLoader laods the screen that in charge of handling the voting end
*/
public class VoteHaveBeenCastLoader {
- private static final String VOTE_HAVE_BEEN_CAST_FXML_PATH = "vote_have_been_cast.fxml";
+ private static final String VOTE_HAVE_BEEN_CAST_FXML_PATH = "/view/vote_have_been_cast.fxml";
private Stage currentStage;
private FXMLLoader fxmlLoader;
diff --git a/voting-booth-gui/src/main/welcome_splash/WelcomeSplashController.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/welcome_splash/WelcomeSplashController.java
similarity index 85%
rename from voting-booth-gui/src/main/welcome_splash/WelcomeSplashController.java
rename to voting-booth-gui/src/main/java/meerkat/voting/gui/welcome_splash/WelcomeSplashController.java
index 9aacbf4..be83e69 100644
--- a/voting-booth-gui/src/main/welcome_splash/WelcomeSplashController.java
+++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/welcome_splash/WelcomeSplashController.java
@@ -1,9 +1,9 @@
-package main.welcome_splash;
+package meerkat.voting.gui.welcome_splash;
import javafx.fxml.FXML;
import javafx.scene.Scene;
import javafx.scene.input.MouseEvent;
-import main.TwoWayNode;
+import meerkat.voting.gui.TwoWayNode;
/**
* Created by Vladimir Eliezer Tokarev on 8/27/2016.
diff --git a/voting-booth-gui/src/main/welcome_splash/WelcomeSplashLoader.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/welcome_splash/WelcomeSplashLoader.java
similarity index 86%
rename from voting-booth-gui/src/main/welcome_splash/WelcomeSplashLoader.java
rename to voting-booth-gui/src/main/java/meerkat/voting/gui/welcome_splash/WelcomeSplashLoader.java
index 6131968..ed70d90 100644
--- a/voting-booth-gui/src/main/welcome_splash/WelcomeSplashLoader.java
+++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/welcome_splash/WelcomeSplashLoader.java
@@ -1,11 +1,11 @@
-package main.welcome_splash;
+package meerkat.voting.gui.welcome_splash;
import javafx.concurrent.Task;
import javafx.fxml.FXMLLoader;
import javafx.scene.Parent;
import javafx.scene.Scene;
import javafx.stage.Stage;
-import main.TwoWayNode;
+import meerkat.voting.gui.TwoWayNode;
import java.io.IOException;
@@ -14,7 +14,7 @@ import java.io.IOException;
* WelcomeSplashLoader creates welcome spalash object and sets its controller
*/
public class WelcomeSplashLoader {
- private static final String WELCOME_SPLASH_FXML_PATH = "welcome_splash_screen.fxml";
+ private static final String WELCOME_SPLASH_FXML_PATH = "/view/welcome_splash_screen.fxml";
private Stage currentStage;
private FXMLLoader fxmlLoader;
diff --git a/voting-booth/src/main/java/meerkat/voting/ui/GraphicalUserInterface.java b/voting-booth-gui/src/main/java/meerkat/voting/ui/GraphicalUserInterface.java
similarity index 99%
rename from voting-booth/src/main/java/meerkat/voting/ui/GraphicalUserInterface.java
rename to voting-booth-gui/src/main/java/meerkat/voting/ui/GraphicalUserInterface.java
index 07e0364..6fba00d 100644
--- a/voting-booth/src/main/java/meerkat/voting/ui/GraphicalUserInterface.java
+++ b/voting-booth-gui/src/main/java/meerkat/voting/ui/GraphicalUserInterface.java
@@ -1,6 +1,6 @@
package meerkat.voting.ui;
-import main.VotingBoothGUIManager;
+import meerkat.voting.gui.VotingBoothGUIManager;
import meerkat.protobuf.Voting;
import meerkat.voting.controller.callbacks.*;
import meerkat.voting.ui.uicommands.*;
diff --git a/voting-booth-gui/src/main/pics/barcode.png b/voting-booth-gui/src/main/pics/barcode.png
deleted file mode 100644
index 10af4e2..0000000
Binary files a/voting-booth-gui/src/main/pics/barcode.png and /dev/null differ
diff --git a/voting-booth-gui/src/main/pics/blacktriangle.png b/voting-booth-gui/src/main/pics/blacktriangle.png
deleted file mode 100644
index e90203f..0000000
Binary files a/voting-booth-gui/src/main/pics/blacktriangle.png and /dev/null differ
diff --git a/voting-booth-gui/src/main/pics/bullets.png b/voting-booth-gui/src/main/pics/bullets.png
deleted file mode 100644
index 96443a0..0000000
Binary files a/voting-booth-gui/src/main/pics/bullets.png and /dev/null differ
diff --git a/voting-booth-gui/src/main/pics/exit.png b/voting-booth-gui/src/main/pics/exit.png
deleted file mode 100644
index ca9675a..0000000
Binary files a/voting-booth-gui/src/main/pics/exit.png and /dev/null differ
diff --git a/voting-booth-gui/src/main/pics/paperFold.png b/voting-booth-gui/src/main/pics/paperFold.png
deleted file mode 100644
index d222114..0000000
Binary files a/voting-booth-gui/src/main/pics/paperFold.png and /dev/null differ
diff --git a/voting-booth-gui/src/main/pics/printer.png b/voting-booth-gui/src/main/pics/printer.png
deleted file mode 100644
index 6dd516c..0000000
Binary files a/voting-booth-gui/src/main/pics/printer.png and /dev/null differ
diff --git a/voting-booth-gui/src/main/pics/profile.png b/voting-booth-gui/src/main/pics/profile.png
deleted file mode 100644
index 7ac6047..0000000
Binary files a/voting-booth-gui/src/main/pics/profile.png and /dev/null differ
diff --git a/voting-booth-gui/src/main/pics/settings.png b/voting-booth-gui/src/main/pics/settings.png
deleted file mode 100644
index e6e5a26..0000000
Binary files a/voting-booth-gui/src/main/pics/settings.png and /dev/null differ
diff --git a/voting-booth-gui/src/main/pics/stickPaper.png b/voting-booth-gui/src/main/pics/stickPaper.png
deleted file mode 100644
index 69888a3..0000000
Binary files a/voting-booth-gui/src/main/pics/stickPaper.png and /dev/null differ
diff --git a/voting-booth-gui/src/main/pics/walkingMan.png b/voting-booth-gui/src/main/pics/walkingMan.png
deleted file mode 100644
index d453243..0000000
Binary files a/voting-booth-gui/src/main/pics/walkingMan.png and /dev/null differ
diff --git a/voting-booth-gui/src/main/pics/women.png b/voting-booth-gui/src/main/pics/women.png
deleted file mode 100644
index 55fa39e..0000000
Binary files a/voting-booth-gui/src/main/pics/women.png and /dev/null differ
diff --git a/voting-booth-gui/src/main/printing_commitment_barcode/printing_commitment_barcode.fxml b/voting-booth-gui/src/main/printing_commitment_barcode/printing_commitment_barcode.fxml
deleted file mode 100644
index 1139084..0000000
--- a/voting-booth-gui/src/main/printing_commitment_barcode/printing_commitment_barcode.fxml
+++ /dev/null
@@ -1,147 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/classes/production/voting-booth-gui/main/pics/barcode.png b/voting-booth-gui/src/main/resources/images/barcode.png
similarity index 100%
rename from classes/production/voting-booth-gui/main/pics/barcode.png
rename to voting-booth-gui/src/main/resources/images/barcode.png
diff --git a/classes/production/voting-booth-gui/main/pics/blacktriangle.png b/voting-booth-gui/src/main/resources/images/blacktriangle.png
similarity index 100%
rename from classes/production/voting-booth-gui/main/pics/blacktriangle.png
rename to voting-booth-gui/src/main/resources/images/blacktriangle.png
diff --git a/classes/production/voting-booth-gui/main/pics/bullets.png b/voting-booth-gui/src/main/resources/images/bullets.png
similarity index 100%
rename from classes/production/voting-booth-gui/main/pics/bullets.png
rename to voting-booth-gui/src/main/resources/images/bullets.png
diff --git a/classes/production/voting-booth-gui/main/pics/exit.png b/voting-booth-gui/src/main/resources/images/exit.png
similarity index 100%
rename from classes/production/voting-booth-gui/main/pics/exit.png
rename to voting-booth-gui/src/main/resources/images/exit.png
diff --git a/classes/production/voting-booth-gui/main/pics/paperFold.png b/voting-booth-gui/src/main/resources/images/paperFold.png
similarity index 100%
rename from classes/production/voting-booth-gui/main/pics/paperFold.png
rename to voting-booth-gui/src/main/resources/images/paperFold.png
diff --git a/classes/production/voting-booth-gui/main/pics/printer.png b/voting-booth-gui/src/main/resources/images/printer.png
similarity index 100%
rename from classes/production/voting-booth-gui/main/pics/printer.png
rename to voting-booth-gui/src/main/resources/images/printer.png
diff --git a/classes/production/voting-booth-gui/main/pics/profile.png b/voting-booth-gui/src/main/resources/images/profile.png
similarity index 100%
rename from classes/production/voting-booth-gui/main/pics/profile.png
rename to voting-booth-gui/src/main/resources/images/profile.png
diff --git a/classes/production/voting-booth-gui/main/pics/settings.png b/voting-booth-gui/src/main/resources/images/settings.png
similarity index 100%
rename from classes/production/voting-booth-gui/main/pics/settings.png
rename to voting-booth-gui/src/main/resources/images/settings.png
diff --git a/classes/production/voting-booth-gui/main/pics/stickPaper.png b/voting-booth-gui/src/main/resources/images/stickPaper.png
similarity index 100%
rename from classes/production/voting-booth-gui/main/pics/stickPaper.png
rename to voting-booth-gui/src/main/resources/images/stickPaper.png
diff --git a/classes/production/voting-booth-gui/main/pics/walkingMan.png b/voting-booth-gui/src/main/resources/images/walkingMan.png
similarity index 100%
rename from classes/production/voting-booth-gui/main/pics/walkingMan.png
rename to voting-booth-gui/src/main/resources/images/walkingMan.png
diff --git a/classes/production/voting-booth-gui/main/pics/women.png b/voting-booth-gui/src/main/resources/images/women.png
similarity index 100%
rename from classes/production/voting-booth-gui/main/pics/women.png
rename to voting-booth-gui/src/main/resources/images/women.png
diff --git a/classes/production/voting-booth-gui/main/ballot_summary/ballot_summary.fxml b/voting-booth-gui/src/main/resources/view/ballot_summary.fxml
similarity index 99%
rename from classes/production/voting-booth-gui/main/ballot_summary/ballot_summary.fxml
rename to voting-booth-gui/src/main/resources/view/ballot_summary.fxml
index e9d84d6..eadc6fa 100644
--- a/classes/production/voting-booth-gui/main/ballot_summary/ballot_summary.fxml
+++ b/voting-booth-gui/src/main/resources/view/ballot_summary.fxml
@@ -7,7 +7,7 @@
-
+
diff --git a/classes/production/voting-booth-gui/main/cast_or_audit/cast_or_audit.fxml b/voting-booth-gui/src/main/resources/view/cast_or_audit.fxml
similarity index 99%
rename from classes/production/voting-booth-gui/main/cast_or_audit/cast_or_audit.fxml
rename to voting-booth-gui/src/main/resources/view/cast_or_audit.fxml
index 5d4a586..8d8270f 100644
--- a/classes/production/voting-booth-gui/main/cast_or_audit/cast_or_audit.fxml
+++ b/voting-booth-gui/src/main/resources/view/cast_or_audit.fxml
@@ -7,7 +7,7 @@
-
+
diff --git a/classes/production/voting-booth-gui/main/printing_commitment_barcode/printing_commitment_barcode.fxml b/voting-booth-gui/src/main/resources/view/printing_commitment_barcode.fxml
similarity index 96%
rename from classes/production/voting-booth-gui/main/printing_commitment_barcode/printing_commitment_barcode.fxml
rename to voting-booth-gui/src/main/resources/view/printing_commitment_barcode.fxml
index 1139084..2c3adde 100644
--- a/classes/production/voting-booth-gui/main/printing_commitment_barcode/printing_commitment_barcode.fxml
+++ b/voting-booth-gui/src/main/resources/view/printing_commitment_barcode.fxml
@@ -119,7 +119,7 @@
-
+
@@ -128,7 +128,7 @@
-
+
diff --git a/voting-booth-gui/src/main/select_candidate_by_picture/select_candidate_by_picture.fxml b/voting-booth-gui/src/main/resources/view/select_candidate_by_picture.fxml
similarity index 97%
rename from voting-booth-gui/src/main/select_candidate_by_picture/select_candidate_by_picture.fxml
rename to voting-booth-gui/src/main/resources/view/select_candidate_by_picture.fxml
index 887fd6e..ef16d71 100644
--- a/voting-booth-gui/src/main/select_candidate_by_picture/select_candidate_by_picture.fxml
+++ b/voting-booth-gui/src/main/resources/view/select_candidate_by_picture.fxml
@@ -7,7 +7,7 @@
-
+
@@ -150,7 +150,7 @@
-
+
@@ -159,7 +159,7 @@
-
+
@@ -168,7 +168,7 @@
-
+
diff --git a/voting-booth-gui/src/main/select_candidate_name/select_candidate_name.fxml b/voting-booth-gui/src/main/resources/view/select_candidate_name.fxml
similarity index 99%
rename from voting-booth-gui/src/main/select_candidate_name/select_candidate_name.fxml
rename to voting-booth-gui/src/main/resources/view/select_candidate_name.fxml
index 288e463..616b281 100644
--- a/voting-booth-gui/src/main/select_candidate_name/select_candidate_name.fxml
+++ b/voting-booth-gui/src/main/resources/view/select_candidate_name.fxml
@@ -6,7 +6,7 @@
-
+
diff --git a/classes/production/voting-booth-gui/main/straight_channel_section/straight_channel_section.fxml b/voting-booth-gui/src/main/resources/view/straight_channel_section.fxml
similarity index 99%
rename from classes/production/voting-booth-gui/main/straight_channel_section/straight_channel_section.fxml
rename to voting-booth-gui/src/main/resources/view/straight_channel_section.fxml
index c53fac5..8959884 100644
--- a/classes/production/voting-booth-gui/main/straight_channel_section/straight_channel_section.fxml
+++ b/voting-booth-gui/src/main/resources/view/straight_channel_section.fxml
@@ -6,7 +6,7 @@
-
+
diff --git a/classes/production/voting-booth-gui/main/thank_for_auditing/thank_for_auditing.fxml b/voting-booth-gui/src/main/resources/view/thank_for_auditing.fxml
similarity index 100%
rename from classes/production/voting-booth-gui/main/thank_for_auditing/thank_for_auditing.fxml
rename to voting-booth-gui/src/main/resources/view/thank_for_auditing.fxml
diff --git a/classes/production/voting-booth-gui/main/vote_have_been_cast/vote_have_been_cast.fxml b/voting-booth-gui/src/main/resources/view/vote_have_been_cast.fxml
similarity index 97%
rename from classes/production/voting-booth-gui/main/vote_have_been_cast/vote_have_been_cast.fxml
rename to voting-booth-gui/src/main/resources/view/vote_have_been_cast.fxml
index 11d45da..9ee4093 100644
--- a/classes/production/voting-booth-gui/main/vote_have_been_cast/vote_have_been_cast.fxml
+++ b/voting-booth-gui/src/main/resources/view/vote_have_been_cast.fxml
@@ -8,7 +8,7 @@
-
+
@@ -208,7 +208,7 @@
-
+
@@ -217,7 +217,7 @@
-
+
@@ -226,7 +226,7 @@
-
+
diff --git a/voting-booth-gui/src/main/welcome_splash/welcome_splash_screen.fxml b/voting-booth-gui/src/main/resources/view/welcome_splash_screen.fxml
similarity index 98%
rename from voting-booth-gui/src/main/welcome_splash/welcome_splash_screen.fxml
rename to voting-booth-gui/src/main/resources/view/welcome_splash_screen.fxml
index 0c3d611..24de823 100644
--- a/voting-booth-gui/src/main/welcome_splash/welcome_splash_screen.fxml
+++ b/voting-booth-gui/src/main/resources/view/welcome_splash_screen.fxml
@@ -5,7 +5,7 @@
-
+
diff --git a/classes/production/voting-booth-gui/main/write_candidate_name/write_candidate_name.fxml b/voting-booth-gui/src/main/resources/view/write_candidate_name.fxml
similarity index 100%
rename from classes/production/voting-booth-gui/main/write_candidate_name/write_candidate_name.fxml
rename to voting-booth-gui/src/main/resources/view/write_candidate_name.fxml
diff --git a/voting-booth-gui/src/main/straight_channel_section/straight_channel_section.fxml b/voting-booth-gui/src/main/straight_channel_section/straight_channel_section.fxml
deleted file mode 100644
index c53fac5..0000000
--- a/voting-booth-gui/src/main/straight_channel_section/straight_channel_section.fxml
+++ /dev/null
@@ -1,322 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/voting-booth-gui/src/main/thank_for_auditing/thank_for_auditing.fxml b/voting-booth-gui/src/main/thank_for_auditing/thank_for_auditing.fxml
deleted file mode 100644
index c0a4df6..0000000
--- a/voting-booth-gui/src/main/thank_for_auditing/thank_for_auditing.fxml
+++ /dev/null
@@ -1,127 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/voting-booth-gui/src/main/vote_have_been_cast/vote_have_been_cast.fxml b/voting-booth-gui/src/main/vote_have_been_cast/vote_have_been_cast.fxml
deleted file mode 100644
index 11d45da..0000000
--- a/voting-booth-gui/src/main/vote_have_been_cast/vote_have_been_cast.fxml
+++ /dev/null
@@ -1,249 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/voting-booth-gui/src/main/write_candidate_name/write_candidate_name.fxml b/voting-booth-gui/src/main/write_candidate_name/write_candidate_name.fxml
deleted file mode 100644
index 94610fc..0000000
--- a/voting-booth-gui/src/main/write_candidate_name/write_candidate_name.fxml
+++ /dev/null
@@ -1,565 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-