Moved android project and new project.

Visual Studio Timeout Task!

172 files changed, 0 insertions, 14565 deletions

diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/DateConverter.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/DateConverter.java
deleted file mode 100644
index 548b1dd09..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/DateConverter.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.twine.tango.dal;
-import com.raizlabs.android.dbflow.converter.TypeConverter;
-import com.twine.tango.dal.enumerations.EnumDemo;
-
-import org.joda.time.DateTime;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-
-/**
- * Represents a DBFlow string to date converter used to parse and store SQLite dates.
- */
-@com.raizlabs.android.dbflow.annotation.TypeConverter
-public class DateConverter extends TypeConverter<String,DateTime>
-{
-    
-    @Override
-    public String getDBValue(DateTime model)
-    {
-        DateTimeFormatter dtfOut = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss.SSS");
-        return dtfOut.print(model);
-    }
-    
-    @Override
-    public DateTime getModelValue(String data)
-    {
-        DateTimeFormatter dtf = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss.SSS");
-        DateTime jodatime = dtf.parseDateTime(data);
-        return jodatime;
-    }
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/Entity.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/Entity.java
deleted file mode 100644
index 00cb546f1..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/Entity.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package com.twine.tango.dal;
-
-import android.databinding.Bindable;
-import android.databinding.Observable;
-import android.databinding.PropertyChangeRegistry;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ColumnIgnore;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.rx2.structure.BaseRXModel;
-
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
-
-import java.util.UUID;
-
-import io.reactivex.Single;
-
-
-/**
- * Represents a DAL base entity.
- * contains the basic columns/properties which are in common to all entities.
- */
-public abstract class Entity extends BaseRXModel implements Observable
-{
-    private transient PropertyChangeRegistry mCallbacks;
-    
-    @ColumnIgnore
-    private int id;
-    
-    @Column(name = "GUID")
-    @PrimaryKey
-    private String guid;
-    
-    @Column(name = "LAST_UPDATED",typeConverter = DateConverter.class)
-    private DateTime last_updated;
-    
-    /**
-     * Gets id.
-     *
-     * @return the id
-     */
-    public int getId()
-    {
-        return id;
-    }
-    
-    /**
-     * Sets id.
-     *
-     * @param id the id
-     */
-    public void setId(int id)
-    {
-        this.id = id;
-    }
-    
-    /**
-     * Gets guid.
-     *
-     * @return the guid
-     */
-    public String getGuid()
-    {
-        return guid;
-    }
-    
-    /**
-     * Sets guid.
-     *
-     * @param guid the guid
-     */
-    public void setGuid(String guid)
-    {
-        this.guid = guid;
-    }
-    
-    /**
-     * Gets last updated.
-     *
-     * @return the last updated
-     */
-    public DateTime getLast_updated()
-    {
-        return last_updated;
-    }
-    
-    /**
-     * Sets last updated.
-     *
-     * @param last_updated the last updated
-     */
-    public void setLast_updated(DateTime last_updated)
-    {
-        this.last_updated = last_updated;
-    }
-    
-    /**
-     * Instantiates a new Entity.
-     */
-    public Entity()
-    {
-        setGuid(UUID.randomUUID().toString());
-        setLast_updated(DateTime.now(DateTimeZone.UTC));
-    }
-    
-    @Override
-    public void addOnPropertyChangedCallback(OnPropertyChangedCallback callback) {
-        synchronized (this) {
-            if (mCallbacks == null) {
-                mCallbacks = new PropertyChangeRegistry();
-            }
-        }
-        mCallbacks.add(callback);
-    }
-    
-    @Override
-    public void removeOnPropertyChangedCallback(OnPropertyChangedCallback callback) {
-        synchronized (this) {
-            if (mCallbacks == null) {
-                return;
-            }
-        }
-        mCallbacks.remove(callback);
-    }
-    
-    /**
-     * Notifies listeners that all properties of this instance have changed.
-     */
-    public void notifyChange() {
-        synchronized (this) {
-            if (mCallbacks == null) {
-                return;
-            }
-        }
-        mCallbacks.notifyCallbacks(this, 0, null);
-    }
-    
-    /**
-     * Notifies listeners that a specific property has changed. The getter for the property
-     * that changes should be marked with {@link Bindable} to generate a field in
-     * <code>BR</code> to be used as <code>fieldId</code>.
-     *
-     * @param fieldId The generated BR id for the Bindable field.
-     */
-    public void notifyPropertyChanged(int fieldId) {
-        synchronized (this) {
-            if (mCallbacks == null) {
-                return;
-            }
-        }
-        mCallbacks.notifyCallbacks(this, fieldId, null);
-    }
-    
-    @Override
-    public Single<Boolean> save()
-    {
-        setLast_updated(DateTime.now(DateTimeZone.UTC));
-        return super.save();
-    }
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/TangoDB.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/TangoDB.java
deleted file mode 100644
index cdbaab1bb..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/TangoDB.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package com.twine.tango.dal;
-
-import com.raizlabs.android.dbflow.annotation.Database;
-import com.raizlabs.android.dbflow.config.DatabaseConfig;
-import com.raizlabs.android.dbflow.config.DatabaseDefinition;
-import com.raizlabs.android.dbflow.config.FlowConfig;
-import com.raizlabs.android.dbflow.config.FlowManager;
-import com.snatik.storage.Storage;
-import com.twine.tango.core.ContextHelper;
-import com.twine.tango.core.ExtendedObject;
-
-import org.apache.commons.io.IOUtils;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
-
-/**
- * Represents the Tango database wrapper object.
- * Must be initialized before use.
- */
-@Database(name = "Tango", version = 1)
-public class TangoDB extends ExtendedObject
-{
-    private static DatabaseDefinition database;
-    private static String database_path;
-    private static String database_name;
-    private static String database_backup_path;
-    
-    /**
-     * Initializes the data base interaction.
-     */
-    public static void init()
-    {
-        database_name = "Tango.db";
-        database_path = ContextHelper.getApplicationContext().getDatabasePath(database_name).getPath();
-        database_backup_path = ContextHelper.getApplicationContext().getDatabasePath("backup").getPath();
-    
-        try
-        {
-            createIfNotFound();
-        } catch (Exception e)
-        {
-            logManager.log(e,"Application failed on 'create database if not' found. will run in DBFlow default mode.");
-        }
-    
-        FlowManager.init(FlowConfig.builder(ContextHelper.getApplicationContext())
-                .addDatabaseConfig(
-                        DatabaseConfig.builder(
-                                TangoDB.class)
-                                .databaseName(database_name)
-                                .build())
-                .build());
-        
-        database = FlowManager.getDatabase(TangoDB.class);
-        
-        try
-        {
-            backup();
-        } catch (IOException e)
-        {
-            logManager.log(e);
-        }
-    }
-    
-    /**
-     * Gets data base file path.
-     *
-     * @return the data base path
-     */
-    public static String getDataBasePath()
-    {
-        return database_path;
-    }
-    
-    /**
-     * Closes the data base connection.
-     */
-    public static void close()
-    {
-        database.close();
-        FlowManager.close();
-    }
-    
-    /**
-     * Copies the current database file to the backup location on the SD card.
-     *
-     * @throws IOException the io exception
-     */
-    public static void backup() throws IOException
-    {
-        Storage storage = new Storage(ContextHelper.getApplicationContext());
-        File f = new File(database_backup_path);
-        boolean ok = f.getParentFile().mkdirs();
-        if (!storage.copy(database_path, database_backup_path))
-        {
-            throw new IOException("Could not copy database file to backup location.");
-        }
-    }
-    
-    /**
-     * Restores the database backup.
-     *
-     * @throws IOException the io exception
-     */
-    public static void restore() throws IOException
-    {
-        try
-        {
-            Storage storage = new Storage(ContextHelper.getApplicationContext());
-            byte[] data = storage.readFile(database_backup_path);
-            replace(data);
-        } catch (Exception e)
-        {
-            throw new IOException("Could not restore database backup.");
-        }
-    }
-    
-    /**
-     * Replaces the current database file with the specified byte array of another database file.
-     * Re-initializes DBFlow after replace.
-     *
-     * @param data the data
-     * @throws IOException the io exception
-     */
-    public static void replace(byte[] data) throws IOException
-    {
-        try
-        {
-            close();
-            Storage storage = new Storage(ContextHelper.getApplicationContext());
-            storage.createFile(database_path, data);
-            init();
-        } catch (Exception e)
-        {
-            throw new IOException("Could not replace the database file.");
-        }
-    }
-    
-    /**
-     * Checks if the database file exist. If not, will copy the default database from raw resources folder.
-     */
-    private static void createIfNotFound() throws Exception
-    {
-        Storage storage = new Storage(ContextHelper.getApplicationContext());
-        if (!storage.isFileExist(database_path))
-        {
-            InputStream inputStream = ContextHelper.getApplicationContext().getResources().openRawResource(R.raw.tangodb);
-            File dir = new File(database_path);
-            boolean ok = dir.getParentFile().mkdirs();
-            boolean b = storage.createFile(database_path, IOUtils.toByteArray(inputStream));
-            inputStream.close();
-        }
-    }
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/dao/TangoDAO.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/dao/TangoDAO.java
deleted file mode 100644
index c74625a72..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/dao/TangoDAO.java
+++ /dev/null
@@ -1,756 +0,0 @@
-package com.twine.tango.dal.dao;
-
-import com.raizlabs.android.dbflow.sql.language.SQLite;
-import com.twine.tango.dal.entities.ActionType;
-import com.twine.tango.dal.entities.Address;
-import com.twine.tango.dal.entities.ApplicationDisplayPanelVersion;
-import com.twine.tango.dal.entities.ApplicationFirmwareVersion;
-import com.twine.tango.dal.entities.ApplicationOsVersion;
-import com.twine.tango.dal.entities.ApplicationVersion;
-import com.twine.tango.dal.entities.BrushStop;
-import com.twine.tango.dal.entities.CartridgeType;
-import com.twine.tango.dal.entities.Cat;
-import com.twine.tango.dal.entities.Cct;
-import com.twine.tango.dal.entities.ColorCatalog;
-import com.twine.tango.dal.entities.ColorSpace;
-import com.twine.tango.dal.entities.Configuration;
-import com.twine.tango.dal.entities.Contact;
-import com.twine.tango.dal.entities.DispenserType;
-import com.twine.tango.dal.entities.EmbeddedFirmwareVersion;
-import com.twine.tango.dal.entities.EmbeddedSoftwareVersion;
-import com.twine.tango.dal.entities.EventType;
-import com.twine.tango.dal.entities.EventTypesAction;
-import com.twine.tango.dal.entities.EventTypesCategory;
-import com.twine.tango.dal.entities.EventTypesGroup;
-import com.twine.tango.dal.entities.FiberShape;
-import com.twine.tango.dal.entities.FiberSynth;
-import com.twine.tango.dal.entities.HardwareDancerType;
-import com.twine.tango.dal.entities.HardwareDancer;
-import com.twine.tango.dal.entities.HardwareMotorType;
-import com.twine.tango.dal.entities.HardwareMotor;
-import com.twine.tango.dal.entities.HardwarePidControlType;
-import com.twine.tango.dal.entities.HardwarePidControl;
-import com.twine.tango.dal.entities.HardwareVersion;
-import com.twine.tango.dal.entities.HardwareWinderType;
-import com.twine.tango.dal.entities.HardwareWinder;
-import com.twine.tango.dal.entities.IdsPackFormula;
-import com.twine.tango.dal.entities.IdsPack;
-import com.twine.tango.dal.entities.JobRun;
-import com.twine.tango.dal.entities.Job;
-import com.twine.tango.dal.entities.LinearMassDensityUnit;
-import com.twine.tango.dal.entities.LiquidType;
-import com.twine.tango.dal.entities.LiquidTypesRml;
-import com.twine.tango.dal.entities.MachineStudioVersion;
-import com.twine.tango.dal.entities.MachineVersion;
-import com.twine.tango.dal.entities.Machine;
-import com.twine.tango.dal.entities.MachinesConfiguration;
-import com.twine.tango.dal.entities.MachinesEvent;
-import com.twine.tango.dal.entities.MediaColor;
-import com.twine.tango.dal.entities.MediaCondition;
-import com.twine.tango.dal.entities.MediaMaterial;
-import com.twine.tango.dal.entities.MediaPurpose;
-import com.twine.tango.dal.entities.MidTankType;
-import com.twine.tango.dal.entities.Organization;
-import com.twine.tango.dal.entities.Permission;
-import com.twine.tango.dal.entities.ProcessParametersTable;
-import com.twine.tango.dal.entities.ProcessParametersTablesGroup;
-import com.twine.tango.dal.entities.Rml;
-import com.twine.tango.dal.entities.Role;
-import com.twine.tango.dal.entities.RolesPermission;
-import com.twine.tango.dal.entities.Segment;
-import com.twine.tango.dal.entities.SpoolType;
-import com.twine.tango.dal.entities.SyncConfiguration;
-import com.twine.tango.dal.entities.TechController;
-import com.twine.tango.dal.entities.TechDispenser;
-import com.twine.tango.dal.entities.TechIo;
-import com.twine.tango.dal.entities.TechMonitor;
-import com.twine.tango.dal.entities.TechMotor;
-import com.twine.tango.dal.entities.TechValf;
-import com.twine.tango.dal.entities.User;
-import com.twine.tango.dal.entities.UsersRole;
-import com.twine.tango.dal.entities.WindingMethod;
-import java.util.List;
-
-public class TangoDAO
-{
-    /**
-    * Gets all the ActionTypes from database.
-    *
-    * @return all ActionTypes
-    */
-    public static List<ActionType> getAllActionTypes()
-    {
-        return SQLite.select().from(ActionType.class).queryList();
-    }
-
-    /**
-    * Gets all the Addresses from database.
-    *
-    * @return all Addresses
-    */
-    public static List<Address> getAllAddresses()
-    {
-        return SQLite.select().from(Address.class).queryList();
-    }
-
-    /**
-    * Gets all the ApplicationDisplayPanelVersions from database.
-    *
-    * @return all ApplicationDisplayPanelVersions
-    */
-    public static List<ApplicationDisplayPanelVersion> getAllApplicationDisplayPanelVersions()
-    {
-        return SQLite.select().from(ApplicationDisplayPanelVersion.class).queryList();
-    }
-
-    /**
-    * Gets all the ApplicationFirmwareVersions from database.
-    *
-    * @return all ApplicationFirmwareVersions
-    */
-    public static List<ApplicationFirmwareVersion> getAllApplicationFirmwareVersions()
-    {
-        return SQLite.select().from(ApplicationFirmwareVersion.class).queryList();
-    }
-
-    /**
-    * Gets all the ApplicationOsVersions from database.
-    *
-    * @return all ApplicationOsVersions
-    */
-    public static List<ApplicationOsVersion> getAllApplicationOsVersions()
-    {
-        return SQLite.select().from(ApplicationOsVersion.class).queryList();
-    }
-
-    /**
-    * Gets all the ApplicationVersions from database.
-    *
-    * @return all ApplicationVersions
-    */
-    public static List<ApplicationVersion> getAllApplicationVersions()
-    {
-        return SQLite.select().from(ApplicationVersion.class).queryList();
-    }
-
-    /**
-    * Gets all the BrushStops from database.
-    *
-    * @return all BrushStops
-    */
-    public static List<BrushStop> getAllBrushStops()
-    {
-        return SQLite.select().from(BrushStop.class).queryList();
-    }
-
-    /**
-    * Gets all the CartridgeTypes from database.
-    *
-    * @return all CartridgeTypes
-    */
-    public static List<CartridgeType> getAllCartridgeTypes()
-    {
-        return SQLite.select().from(CartridgeType.class).queryList();
-    }
-
-    /**
-    * Gets all the Cats from database.
-    *
-    * @return all Cats
-    */
-    public static List<Cat> getAllCats()
-    {
-        return SQLite.select().from(Cat.class).queryList();
-    }
-
-    /**
-    * Gets all the Ccts from database.
-    *
-    * @return all Ccts
-    */
-    public static List<Cct> getAllCcts()
-    {
-        return SQLite.select().from(Cct.class).queryList();
-    }
-
-    /**
-    * Gets all the ColorCatalogs from database.
-    *
-    * @return all ColorCatalogs
-    */
-    public static List<ColorCatalog> getAllColorCatalogs()
-    {
-        return SQLite.select().from(ColorCatalog.class).queryList();
-    }
-
-    /**
-    * Gets all the ColorSpaces from database.
-    *
-    * @return all ColorSpaces
-    */
-    public static List<ColorSpace> getAllColorSpaces()
-    {
-        return SQLite.select().from(ColorSpace.class).queryList();
-    }
-
-    /**
-    * Gets all the Configurations from database.
-    *
-    * @return all Configurations
-    */
-    public static List<Configuration> getAllConfigurations()
-    {
-        return SQLite.select().from(Configuration.class).queryList();
-    }
-
-    /**
-    * Gets all the Contacts from database.
-    *
-    * @return all Contacts
-    */
-    public static List<Contact> getAllContacts()
-    {
-        return SQLite.select().from(Contact.class).queryList();
-    }
-
-    /**
-    * Gets all the DispenserTypes from database.
-    *
-    * @return all DispenserTypes
-    */
-    public static List<DispenserType> getAllDispenserTypes()
-    {
-        return SQLite.select().from(DispenserType.class).queryList();
-    }
-
-    /**
-    * Gets all the EmbeddedFirmwareVersions from database.
-    *
-    * @return all EmbeddedFirmwareVersions
-    */
-    public static List<EmbeddedFirmwareVersion> getAllEmbeddedFirmwareVersions()
-    {
-        return SQLite.select().from(EmbeddedFirmwareVersion.class).queryList();
-    }
-
-    /**
-    * Gets all the EmbeddedSoftwareVersions from database.
-    *
-    * @return all EmbeddedSoftwareVersions
-    */
-    public static List<EmbeddedSoftwareVersion> getAllEmbeddedSoftwareVersions()
-    {
-        return SQLite.select().from(EmbeddedSoftwareVersion.class).queryList();
-    }
-
-    /**
-    * Gets all the EventTypes from database.
-    *
-    * @return all EventTypes
-    */
-    public static List<EventType> getAllEventTypes()
-    {
-        return SQLite.select().from(EventType.class).queryList();
-    }
-
-    /**
-    * Gets all the EventTypesActions from database.
-    *
-    * @return all EventTypesActions
-    */
-    public static List<EventTypesAction> getAllEventTypesActions()
-    {
-        return SQLite.select().from(EventTypesAction.class).queryList();
-    }
-
-    /**
-    * Gets all the EventTypesCategories from database.
-    *
-    * @return all EventTypesCategories
-    */
-    public static List<EventTypesCategory> getAllEventTypesCategories()
-    {
-        return SQLite.select().from(EventTypesCategory.class).queryList();
-    }
-
-    /**
-    * Gets all the EventTypesGroups from database.
-    *
-    * @return all EventTypesGroups
-    */
-    public static List<EventTypesGroup> getAllEventTypesGroups()
-    {
-        return SQLite.select().from(EventTypesGroup.class).queryList();
-    }
-
-    /**
-    * Gets all the FiberShapes from database.
-    *
-    * @return all FiberShapes
-    */
-    public static List<FiberShape> getAllFiberShapes()
-    {
-        return SQLite.select().from(FiberShape.class).queryList();
-    }
-
-    /**
-    * Gets all the FiberSynths from database.
-    *
-    * @return all FiberSynths
-    */
-    public static List<FiberSynth> getAllFiberSynths()
-    {
-        return SQLite.select().from(FiberSynth.class).queryList();
-    }
-
-    /**
-    * Gets all the HardwareDancerTypes from database.
-    *
-    * @return all HardwareDancerTypes
-    */
-    public static List<HardwareDancerType> getAllHardwareDancerTypes()
-    {
-        return SQLite.select().from(HardwareDancerType.class).queryList();
-    }
-
-    /**
-    * Gets all the HardwareDancers from database.
-    *
-    * @return all HardwareDancers
-    */
-    public static List<HardwareDancer> getAllHardwareDancers()
-    {
-        return SQLite.select().from(HardwareDancer.class).queryList();
-    }
-
-    /**
-    * Gets all the HardwareMotorTypes from database.
-    *
-    * @return all HardwareMotorTypes
-    */
-    public static List<HardwareMotorType> getAllHardwareMotorTypes()
-    {
-        return SQLite.select().from(HardwareMotorType.class).queryList();
-    }
-
-    /**
-    * Gets all the HardwareMotors from database.
-    *
-    * @return all HardwareMotors
-    */
-    public static List<HardwareMotor> getAllHardwareMotors()
-    {
-        return SQLite.select().from(HardwareMotor.class).queryList();
-    }
-
-    /**
-    * Gets all the HardwarePidControlTypes from database.
-    *
-    * @return all HardwarePidControlTypes
-    */
-    public static List<HardwarePidControlType> getAllHardwarePidControlTypes()
-    {
-        return SQLite.select().from(HardwarePidControlType.class).queryList();
-    }
-
-    /**
-    * Gets all the HardwarePidControls from database.
-    *
-    * @return all HardwarePidControls
-    */
-    public static List<HardwarePidControl> getAllHardwarePidControls()
-    {
-        return SQLite.select().from(HardwarePidControl.class).queryList();
-    }
-
-    /**
-    * Gets all the HardwareVersions from database.
-    *
-    * @return all HardwareVersions
-    */
-    public static List<HardwareVersion> getAllHardwareVersions()
-    {
-        return SQLite.select().from(HardwareVersion.class).queryList();
-    }
-
-    /**
-    * Gets all the HardwareWinderTypes from database.
-    *
-    * @return all HardwareWinderTypes
-    */
-    public static List<HardwareWinderType> getAllHardwareWinderTypes()
-    {
-        return SQLite.select().from(HardwareWinderType.class).queryList();
-    }
-
-    /**
-    * Gets all the HardwareWinders from database.
-    *
-    * @return all HardwareWinders
-    */
-    public static List<HardwareWinder> getAllHardwareWinders()
-    {
-        return SQLite.select().from(HardwareWinder.class).queryList();
-    }
-
-    /**
-    * Gets all the IdsPackFormulas from database.
-    *
-    * @return all IdsPackFormulas
-    */
-    public static List<IdsPackFormula> getAllIdsPackFormulas()
-    {
-        return SQLite.select().from(IdsPackFormula.class).queryList();
-    }
-
-    /**
-    * Gets all the IdsPacks from database.
-    *
-    * @return all IdsPacks
-    */
-    public static List<IdsPack> getAllIdsPacks()
-    {
-        return SQLite.select().from(IdsPack.class).queryList();
-    }
-
-    /**
-    * Gets all the JobRuns from database.
-    *
-    * @return all JobRuns
-    */
-    public static List<JobRun> getAllJobRuns()
-    {
-        return SQLite.select().from(JobRun.class).queryList();
-    }
-
-    /**
-    * Gets all the Jobs from database.
-    *
-    * @return all Jobs
-    */
-    public static List<Job> getAllJobs()
-    {
-        return SQLite.select().from(Job.class).queryList();
-    }
-
-    /**
-    * Gets all the LinearMassDensityUnits from database.
-    *
-    * @return all LinearMassDensityUnits
-    */
-    public static List<LinearMassDensityUnit> getAllLinearMassDensityUnits()
-    {
-        return SQLite.select().from(LinearMassDensityUnit.class).queryList();
-    }
-
-    /**
-    * Gets all the LiquidTypes from database.
-    *
-    * @return all LiquidTypes
-    */
-    public static List<LiquidType> getAllLiquidTypes()
-    {
-        return SQLite.select().from(LiquidType.class).queryList();
-    }
-
-    /**
-    * Gets all the LiquidTypesRmls from database.
-    *
-    * @return all LiquidTypesRmls
-    */
-    public static List<LiquidTypesRml> getAllLiquidTypesRmls()
-    {
-        return SQLite.select().from(LiquidTypesRml.class).queryList();
-    }
-
-    /**
-    * Gets all the MachineStudioVersions from database.
-    *
-    * @return all MachineStudioVersions
-    */
-    public static List<MachineStudioVersion> getAllMachineStudioVersions()
-    {
-        return SQLite.select().from(MachineStudioVersion.class).queryList();
-    }
-
-    /**
-    * Gets all the MachineVersions from database.
-    *
-    * @return all MachineVersions
-    */
-    public static List<MachineVersion> getAllMachineVersions()
-    {
-        return SQLite.select().from(MachineVersion.class).queryList();
-    }
-
-    /**
-    * Gets all the Machines from database.
-    *
-    * @return all Machines
-    */
-    public static List<Machine> getAllMachines()
-    {
-        return SQLite.select().from(Machine.class).queryList();
-    }
-
-    /**
-    * Gets all the MachinesConfigurations from database.
-    *
-    * @return all MachinesConfigurations
-    */
-    public static List<MachinesConfiguration> getAllMachinesConfigurations()
-    {
-        return SQLite.select().from(MachinesConfiguration.class).queryList();
-    }
-
-    /**
-    * Gets all the MachinesEvents from database.
-    *
-    * @return all MachinesEvents
-    */
-    public static List<MachinesEvent> getAllMachinesEvents()
-    {
-        return SQLite.select().from(MachinesEvent.class).queryList();
-    }
-
-    /**
-    * Gets all the MediaColors from database.
-    *
-    * @return all MediaColors
-    */
-    public static List<MediaColor> getAllMediaColors()
-    {
-        return SQLite.select().from(MediaColor.class).queryList();
-    }
-
-    /**
-    * Gets all the MediaConditions from database.
-    *
-    * @return all MediaConditions
-    */
-    public static List<MediaCondition> getAllMediaConditions()
-    {
-        return SQLite.select().from(MediaCondition.class).queryList();
-    }
-
-    /**
-    * Gets all the MediaMaterials from database.
-    *
-    * @return all MediaMaterials
-    */
-    public static List<MediaMaterial> getAllMediaMaterials()
-    {
-        return SQLite.select().from(MediaMaterial.class).queryList();
-    }
-
-    /**
-    * Gets all the MediaPurposes from database.
-    *
-    * @return all MediaPurposes
-    */
-    public static List<MediaPurpose> getAllMediaPurposes()
-    {
-        return SQLite.select().from(MediaPurpose.class).queryList();
-    }
-
-    /**
-    * Gets all the MidTankTypes from database.
-    *
-    * @return all MidTankTypes
-    */
-    public static List<MidTankType> getAllMidTankTypes()
-    {
-        return SQLite.select().from(MidTankType.class).queryList();
-    }
-
-    /**
-    * Gets all the Organizations from database.
-    *
-    * @return all Organizations
-    */
-    public static List<Organization> getAllOrganizations()
-    {
-        return SQLite.select().from(Organization.class).queryList();
-    }
-
-    /**
-    * Gets all the Permissions from database.
-    *
-    * @return all Permissions
-    */
-    public static List<Permission> getAllPermissions()
-    {
-        return SQLite.select().from(Permission.class).queryList();
-    }
-
-    /**
-    * Gets all the ProcessParametersTables from database.
-    *
-    * @return all ProcessParametersTables
-    */
-    public static List<ProcessParametersTable> getAllProcessParametersTables()
-    {
-        return SQLite.select().from(ProcessParametersTable.class).queryList();
-    }
-
-    /**
-    * Gets all the ProcessParametersTablesGroups from database.
-    *
-    * @return all ProcessParametersTablesGroups
-    */
-    public static List<ProcessParametersTablesGroup> getAllProcessParametersTablesGroups()
-    {
-        return SQLite.select().from(ProcessParametersTablesGroup.class).queryList();
-    }
-
-    /**
-    * Gets all the Rmls from database.
-    *
-    * @return all Rmls
-    */
-    public static List<Rml> getAllRmls()
-    {
-        return SQLite.select().from(Rml.class).queryList();
-    }
-
-    /**
-    * Gets all the Roles from database.
-    *
-    * @return all Roles
-    */
-    public static List<Role> getAllRoles()
-    {
-        return SQLite.select().from(Role.class).queryList();
-    }
-
-    /**
-    * Gets all the RolesPermissions from database.
-    *
-    * @return all RolesPermissions
-    */
-    public static List<RolesPermission> getAllRolesPermissions()
-    {
-        return SQLite.select().from(RolesPermission.class).queryList();
-    }
-
-    /**
-    * Gets all the Segments from database.
-    *
-    * @return all Segments
-    */
-    public static List<Segment> getAllSegments()
-    {
-        return SQLite.select().from(Segment.class).queryList();
-    }
-
-    /**
-    * Gets all the SpoolTypes from database.
-    *
-    * @return all SpoolTypes
-    */
-    public static List<SpoolType> getAllSpoolTypes()
-    {
-        return SQLite.select().from(SpoolType.class).queryList();
-    }
-
-    /**
-    * Gets all the SyncConfigurations from database.
-    *
-    * @return all SyncConfigurations
-    */
-    public static List<SyncConfiguration> getAllSyncConfigurations()
-    {
-        return SQLite.select().from(SyncConfiguration.class).queryList();
-    }
-
-    /**
-    * Gets all the TechControllers from database.
-    *
-    * @return all TechControllers
-    */
-    public static List<TechController> getAllTechControllers()
-    {
-        return SQLite.select().from(TechController.class).queryList();
-    }
-
-    /**
-    * Gets all the TechDispensers from database.
-    *
-    * @return all TechDispensers
-    */
-    public static List<TechDispenser> getAllTechDispensers()
-    {
-        return SQLite.select().from(TechDispenser.class).queryList();
-    }
-
-    /**
-    * Gets all the TechIos from database.
-    *
-    * @return all TechIos
-    */
-    public static List<TechIo> getAllTechIos()
-    {
-        return SQLite.select().from(TechIo.class).queryList();
-    }
-
-    /**
-    * Gets all the TechMonitors from database.
-    *
-    * @return all TechMonitors
-    */
-    public static List<TechMonitor> getAllTechMonitors()
-    {
-        return SQLite.select().from(TechMonitor.class).queryList();
-    }
-
-    /**
-    * Gets all the TechMotors from database.
-    *
-    * @return all TechMotors
-    */
-    public static List<TechMotor> getAllTechMotors()
-    {
-        return SQLite.select().from(TechMotor.class).queryList();
-    }
-
-    /**
-    * Gets all the TechValves from database.
-    *
-    * @return all TechValves
-    */
-    public static List<TechValf> getAllTechValves()
-    {
-        return SQLite.select().from(TechValf.class).queryList();
-    }
-
-    /**
-    * Gets all the Users from database.
-    *
-    * @return all Users
-    */
-    public static List<User> getAllUsers()
-    {
-        return SQLite.select().from(User.class).queryList();
-    }
-
-    /**
-    * Gets all the UsersRoles from database.
-    *
-    * @return all UsersRoles
-    */
-    public static List<UsersRole> getAllUsersRoles()
-    {
-        return SQLite.select().from(UsersRole.class).queryList();
-    }
-
-    /**
-    * Gets all the WindingMethods from database.
-    *
-    * @return all WindingMethods
-    */
-    public static List<WindingMethod> getAllWindingMethods()
-    {
-        return SQLite.select().from(WindingMethod.class).queryList();
-    }
-
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ActionType.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ActionType.java
deleted file mode 100644
index 61f306764..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ActionType.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "ACTION_TYPES", database = TangoDB.class, cachingEnabled = true)
-public class ActionType extends ActionTypeBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ActionTypeBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ActionTypeBase.java
deleted file mode 100644
index b12024870..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ActionTypeBase.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class ActionTypeBase extends Entity 
-    {
-    
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Address.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Address.java
deleted file mode 100644
index 289c4e59d..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Address.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "ADDRESSES", database = TangoDB.class, cachingEnabled = true)
-public class Address extends AddressBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/AddressBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/AddressBase.java
deleted file mode 100644
index 63dfa8309..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/AddressBase.java
+++ /dev/null
@@ -1,239 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class AddressBase extends Entity 
-    {
-    
-            @Column(name = "DELETED")
-            private boolean deleted;
-
-    
-    
-            @Column(name = "ADDRESS_STRING")
-            private String addressString;
-
-    
-    
-            @Column(name = "LOCALITY")
-            private String locality;
-
-    
-    
-            @Column(name = "COUNTRY")
-            private String country;
-
-    
-    
-            @Column(name = "CITY")
-            private String city;
-
-    
-    
-            @Column(name = "STATE")
-            private String state;
-
-    
-    
-            @Column(name = "COUNTRY_CODE")
-            private String countryCode;
-
-    
-    
-            @Column(name = "POSTAL_CODE")
-            private String postalCode;
-
-    
-
-     
-         /**
-         * Gets the Deleted.
-         *
-         * return the Deleted
-         */
-         @Bindable
-         public boolean isDeleted()
-         {
-            return deleted;
-         }
-
-         /**
-         * Sets the Deleted.
-         *
-         * @param deleted the Deleted
-         */
-         public void setDeleted(boolean deleted)
-         {
-            this.deleted = deleted;
-            notifyPropertyChanged(BR.deleted);
-         }
-     
-     
-         /**
-         * Gets the AddressString.
-         *
-         * return the AddressString
-         */
-         @Bindable
-         public String getAddressString()
-         {
-            return addressString;
-         }
-
-         /**
-         * Sets the AddressString.
-         *
-         * @param addressString the AddressString
-         */
-         public void setAddressString(String addressString)
-         {
-            this.addressString = addressString;
-            notifyPropertyChanged(BR.addressString);
-         }
-     
-     
-         /**
-         * Gets the Locality.
-         *
-         * return the Locality
-         */
-         @Bindable
-         public String getLocality()
-         {
-            return locality;
-         }
-
-         /**
-         * Sets the Locality.
-         *
-         * @param locality the Locality
-         */
-         public void setLocality(String locality)
-         {
-            this.locality = locality;
-            notifyPropertyChanged(BR.locality);
-         }
-     
-     
-         /**
-         * Gets the Country.
-         *
-         * return the Country
-         */
-         @Bindable
-         public String getCountry()
-         {
-            return country;
-         }
-
-         /**
-         * Sets the Country.
-         *
-         * @param country the Country
-         */
-         public void setCountry(String country)
-         {
-            this.country = country;
-            notifyPropertyChanged(BR.country);
-         }
-     
-     
-         /**
-         * Gets the City.
-         *
-         * return the City
-         */
-         @Bindable
-         public String getCity()
-         {
-            return city;
-         }
-
-         /**
-         * Sets the City.
-         *
-         * @param city the City
-         */
-         public void setCity(String city)
-         {
-            this.city = city;
-            notifyPropertyChanged(BR.city);
-         }
-     
-     
-         /**
-         * Gets the State.
-         *
-         * return the State
-         */
-         @Bindable
-         public String getState()
-         {
-            return state;
-         }
-
-         /**
-         * Sets the State.
-         *
-         * @param state the State
-         */
-         public void setState(String state)
-         {
-            this.state = state;
-            notifyPropertyChanged(BR.state);
-         }
-     
-     
-         /**
-         * Gets the CountryCode.
-         *
-         * return the CountryCode
-         */
-         @Bindable
-         public String getCountryCode()
-         {
-            return countryCode;
-         }
-
-         /**
-         * Sets the CountryCode.
-         *
-         * @param countryCode the CountryCode
-         */
-         public void setCountryCode(String countryCode)
-         {
-            this.countryCode = countryCode;
-            notifyPropertyChanged(BR.countryCode);
-         }
-     
-     
-         /**
-         * Gets the PostalCode.
-         *
-         * return the PostalCode
-         */
-         @Bindable
-         public String getPostalCode()
-         {
-            return postalCode;
-         }
-
-         /**
-         * Sets the PostalCode.
-         *
-         * @param postalCode the PostalCode
-         */
-         public void setPostalCode(String postalCode)
-         {
-            this.postalCode = postalCode;
-            notifyPropertyChanged(BR.postalCode);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationDisplayPanelVersion.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationDisplayPanelVersion.java
deleted file mode 100644
index 968082ce9..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationDisplayPanelVersion.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "APPLICATION_DISPLAY_PANEL_VERSIONS", database = TangoDB.class, cachingEnabled = true)
-public class ApplicationDisplayPanelVersion extends ApplicationDisplayPanelVersionBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationDisplayPanelVersionBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationDisplayPanelVersionBase.java
deleted file mode 100644
index 5540a43b9..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationDisplayPanelVersionBase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class ApplicationDisplayPanelVersionBase extends Entity 
-    {
-    
-            @Column(name = "VERSION")
-            private double version;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-
-     
-         /**
-         * Gets the Version.
-         *
-         * return the Version
-         */
-         @Bindable
-         public double getVersion()
-         {
-            return version;
-         }
-
-         /**
-         * Sets the Version.
-         *
-         * @param version the Version
-         */
-         public void setVersion(double version)
-         {
-            this.version = version;
-            notifyPropertyChanged(BR.version);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationFirmwareVersion.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationFirmwareVersion.java
deleted file mode 100644
index 26aa6192f..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationFirmwareVersion.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "APPLICATION_FIRMWARE_VERSIONS", database = TangoDB.class, cachingEnabled = true)
-public class ApplicationFirmwareVersion extends ApplicationFirmwareVersionBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationFirmwareVersionBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationFirmwareVersionBase.java
deleted file mode 100644
index b72c2824b..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationFirmwareVersionBase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class ApplicationFirmwareVersionBase extends Entity 
-    {
-    
-            @Column(name = "VERSION")
-            private double version;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-
-     
-         /**
-         * Gets the Version.
-         *
-         * return the Version
-         */
-         @Bindable
-         public double getVersion()
-         {
-            return version;
-         }
-
-         /**
-         * Sets the Version.
-         *
-         * @param version the Version
-         */
-         public void setVersion(double version)
-         {
-            this.version = version;
-            notifyPropertyChanged(BR.version);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationOsVersion.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationOsVersion.java
deleted file mode 100644
index 9bf8c1e08..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationOsVersion.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "APPLICATION_OS_VERSIONS", database = TangoDB.class, cachingEnabled = true)
-public class ApplicationOsVersion extends ApplicationOsVersionBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationOsVersionBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationOsVersionBase.java
deleted file mode 100644
index 53cf9e864..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationOsVersionBase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class ApplicationOsVersionBase extends Entity 
-    {
-    
-            @Column(name = "VERSION")
-            private double version;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-
-     
-         /**
-         * Gets the Version.
-         *
-         * return the Version
-         */
-         @Bindable
-         public double getVersion()
-         {
-            return version;
-         }
-
-         /**
-         * Sets the Version.
-         *
-         * @param version the Version
-         */
-         public void setVersion(double version)
-         {
-            this.version = version;
-            notifyPropertyChanged(BR.version);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationVersion.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationVersion.java
deleted file mode 100644
index b57c511c9..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationVersion.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "APPLICATION_VERSIONS", database = TangoDB.class, cachingEnabled = true)
-public class ApplicationVersion extends ApplicationVersionBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationVersionBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationVersionBase.java
deleted file mode 100644
index f3ae3b9a2..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationVersionBase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class ApplicationVersionBase extends Entity 
-    {
-    
-            @Column(name = "VERSION")
-            private double version;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-
-     
-         /**
-         * Gets the Version.
-         *
-         * return the Version
-         */
-         @Bindable
-         public double getVersion()
-         {
-            return version;
-         }
-
-         /**
-         * Sets the Version.
-         *
-         * @param version the Version
-         */
-         public void setVersion(double version)
-         {
-            this.version = version;
-            notifyPropertyChanged(BR.version);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/BrushStop.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/BrushStop.java
deleted file mode 100644
index ed861bf0f..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/BrushStop.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "BRUSH_STOPS", database = TangoDB.class, cachingEnabled = true)
-public class BrushStop extends BrushStopBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/BrushStopBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/BrushStopBase.java
deleted file mode 100644
index 1e09a088e..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/BrushStopBase.java
+++ /dev/null
@@ -1,687 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class BrushStopBase extends Entity 
-    {
-    
-            @Column(name = "OFFSET_PERCENT")
-            private double offsetPercent;
-
-    
-    
-            @Column(name = "STOP_INDEX")
-            private int stopIndex;
-
-    
-    
-            @Column(name = "CYAN")
-            private double cyan;
-
-    
-    
-            @Column(name = "MAGENTA")
-            private double magenta;
-
-    
-    
-            @Column(name = "YELLOW")
-            private double yellow;
-
-    
-    
-            @Column(name = "BLACK")
-            private double black;
-
-    
-    
-            @Column(name = "RED")
-            private int red;
-
-    
-    
-            @Column(name = "GREEN")
-            private int green;
-
-    
-    
-            @Column(name = "BLUE")
-            private int blue;
-
-    
-    
-            @Column(name = "L")
-            private double l;
-
-    
-    
-            @Column(name = "A")
-            private double a;
-
-    
-    
-            @Column(name = "B")
-            private double b;
-
-    
-    
-            @Column(name = "V0")
-            private double v0;
-
-    
-    
-            @Column(name = "V1")
-            private double v1;
-
-    
-    
-            @Column(name = "V2")
-            private double v2;
-
-    
-    
-            @Column(name = "V3")
-            private double v3;
-
-    
-    
-            @Column(name = "V4")
-            private double v4;
-
-    
-    
-            @Column(name = "V5")
-            private double v5;
-
-    
-    
-            @Column(name = "V6")
-            private double v6;
-
-    
-    
-            @Column(name = "V7")
-            private double v7;
-
-    
-    
-            @Column(name = "COLOR_CATALOG_CODE")
-            private int colorCatalogCode;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "COLOR_CATALOG_GUID", foreignKeyColumnName = "GUID")})
-            private ColorCatalog colorCatalog;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "COLOR_SPACE_GUID", foreignKeyColumnName = "GUID")})
-            private ColorSpace colorSpace;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "SEGMENT_GUID", foreignKeyColumnName = "GUID")})
-            private Segment segment;
-
-    
-
-     
-         /**
-         * Gets the OffsetPercent.
-         *
-         * return the OffsetPercent
-         */
-         @Bindable
-         public double getOffsetPercent()
-         {
-            return offsetPercent;
-         }
-
-         /**
-         * Sets the OffsetPercent.
-         *
-         * @param offsetPercent the OffsetPercent
-         */
-         public void setOffsetPercent(double offsetPercent)
-         {
-            this.offsetPercent = offsetPercent;
-            notifyPropertyChanged(BR.offsetPercent);
-         }
-     
-     
-         /**
-         * Gets the StopIndex.
-         *
-         * return the StopIndex
-         */
-         @Bindable
-         public int getStopIndex()
-         {
-            return stopIndex;
-         }
-
-         /**
-         * Sets the StopIndex.
-         *
-         * @param stopIndex the StopIndex
-         */
-         public void setStopIndex(int stopIndex)
-         {
-            this.stopIndex = stopIndex;
-            notifyPropertyChanged(BR.stopIndex);
-         }
-     
-     
-         /**
-         * Gets the Cyan.
-         *
-         * return the Cyan
-         */
-         @Bindable
-         public double getCyan()
-         {
-            return cyan;
-         }
-
-         /**
-         * Sets the Cyan.
-         *
-         * @param cyan the Cyan
-         */
-         public void setCyan(double cyan)
-         {
-            this.cyan = cyan;
-            notifyPropertyChanged(BR.cyan);
-         }
-     
-     
-         /**
-         * Gets the Magenta.
-         *
-         * return the Magenta
-         */
-         @Bindable
-         public double getMagenta()
-         {
-            return magenta;
-         }
-
-         /**
-         * Sets the Magenta.
-         *
-         * @param magenta the Magenta
-         */
-         public void setMagenta(double magenta)
-         {
-            this.magenta = magenta;
-            notifyPropertyChanged(BR.magenta);
-         }
-     
-     
-         /**
-         * Gets the Yellow.
-         *
-         * return the Yellow
-         */
-         @Bindable
-         public double getYellow()
-         {
-            return yellow;
-         }
-
-         /**
-         * Sets the Yellow.
-         *
-         * @param yellow the Yellow
-         */
-         public void setYellow(double yellow)
-         {
-            this.yellow = yellow;
-            notifyPropertyChanged(BR.yellow);
-         }
-     
-     
-         /**
-         * Gets the Black.
-         *
-         * return the Black
-         */
-         @Bindable
-         public double getBlack()
-         {
-            return black;
-         }
-
-         /**
-         * Sets the Black.
-         *
-         * @param black the Black
-         */
-         public void setBlack(double black)
-         {
-            this.black = black;
-            notifyPropertyChanged(BR.black);
-         }
-     
-     
-         /**
-         * Gets the Red.
-         *
-         * return the Red
-         */
-         @Bindable
-         public int getRed()
-         {
-            return red;
-         }
-
-         /**
-         * Sets the Red.
-         *
-         * @param red the Red
-         */
-         public void setRed(int red)
-         {
-            this.red = red;
-            notifyPropertyChanged(BR.red);
-         }
-     
-     
-         /**
-         * Gets the Green.
-         *
-         * return the Green
-         */
-         @Bindable
-         public int getGreen()
-         {
-            return green;
-         }
-
-         /**
-         * Sets the Green.
-         *
-         * @param green the Green
-         */
-         public void setGreen(int green)
-         {
-            this.green = green;
-            notifyPropertyChanged(BR.green);
-         }
-     
-     
-         /**
-         * Gets the Blue.
-         *
-         * return the Blue
-         */
-         @Bindable
-         public int getBlue()
-         {
-            return blue;
-         }
-
-         /**
-         * Sets the Blue.
-         *
-         * @param blue the Blue
-         */
-         public void setBlue(int blue)
-         {
-            this.blue = blue;
-            notifyPropertyChanged(BR.blue);
-         }
-     
-     
-         /**
-         * Gets the L.
-         *
-         * return the L
-         */
-         @Bindable
-         public double getL()
-         {
-            return l;
-         }
-
-         /**
-         * Sets the L.
-         *
-         * @param l the L
-         */
-         public void setL(double l)
-         {
-            this.l = l;
-            notifyPropertyChanged(BR.l);
-         }
-     
-     
-         /**
-         * Gets the A.
-         *
-         * return the A
-         */
-         @Bindable
-         public double getA()
-         {
-            return a;
-         }
-
-         /**
-         * Sets the A.
-         *
-         * @param a the A
-         */
-         public void setA(double a)
-         {
-            this.a = a;
-            notifyPropertyChanged(BR.a);
-         }
-     
-     
-         /**
-         * Gets the B.
-         *
-         * return the B
-         */
-         @Bindable
-         public double getB()
-         {
-            return b;
-         }
-
-         /**
-         * Sets the B.
-         *
-         * @param b the B
-         */
-         public void setB(double b)
-         {
-            this.b = b;
-            notifyPropertyChanged(BR.b);
-         }
-     
-     
-         /**
-         * Gets the V0.
-         *
-         * return the V0
-         */
-         @Bindable
-         public double getV0()
-         {
-            return v0;
-         }
-
-         /**
-         * Sets the V0.
-         *
-         * @param v0 the V0
-         */
-         public void setV0(double v0)
-         {
-            this.v0 = v0;
-            notifyPropertyChanged(BR.v0);
-         }
-     
-     
-         /**
-         * Gets the V1.
-         *
-         * return the V1
-         */
-         @Bindable
-         public double getV1()
-         {
-            return v1;
-         }
-
-         /**
-         * Sets the V1.
-         *
-         * @param v1 the V1
-         */
-         public void setV1(double v1)
-         {
-            this.v1 = v1;
-            notifyPropertyChanged(BR.v1);
-         }
-     
-     
-         /**
-         * Gets the V2.
-         *
-         * return the V2
-         */
-         @Bindable
-         public double getV2()
-         {
-            return v2;
-         }
-
-         /**
-         * Sets the V2.
-         *
-         * @param v2 the V2
-         */
-         public void setV2(double v2)
-         {
-            this.v2 = v2;
-            notifyPropertyChanged(BR.v2);
-         }
-     
-     
-         /**
-         * Gets the V3.
-         *
-         * return the V3
-         */
-         @Bindable
-         public double getV3()
-         {
-            return v3;
-         }
-
-         /**
-         * Sets the V3.
-         *
-         * @param v3 the V3
-         */
-         public void setV3(double v3)
-         {
-            this.v3 = v3;
-            notifyPropertyChanged(BR.v3);
-         }
-     
-     
-         /**
-         * Gets the V4.
-         *
-         * return the V4
-         */
-         @Bindable
-         public double getV4()
-         {
-            return v4;
-         }
-
-         /**
-         * Sets the V4.
-         *
-         * @param v4 the V4
-         */
-         public void setV4(double v4)
-         {
-            this.v4 = v4;
-            notifyPropertyChanged(BR.v4);
-         }
-     
-     
-         /**
-         * Gets the V5.
-         *
-         * return the V5
-         */
-         @Bindable
-         public double getV5()
-         {
-            return v5;
-         }
-
-         /**
-         * Sets the V5.
-         *
-         * @param v5 the V5
-         */
-         public void setV5(double v5)
-         {
-            this.v5 = v5;
-            notifyPropertyChanged(BR.v5);
-         }
-     
-     
-         /**
-         * Gets the V6.
-         *
-         * return the V6
-         */
-         @Bindable
-         public double getV6()
-         {
-            return v6;
-         }
-
-         /**
-         * Sets the V6.
-         *
-         * @param v6 the V6
-         */
-         public void setV6(double v6)
-         {
-            this.v6 = v6;
-            notifyPropertyChanged(BR.v6);
-         }
-     
-     
-         /**
-         * Gets the V7.
-         *
-         * return the V7
-         */
-         @Bindable
-         public double getV7()
-         {
-            return v7;
-         }
-
-         /**
-         * Sets the V7.
-         *
-         * @param v7 the V7
-         */
-         public void setV7(double v7)
-         {
-            this.v7 = v7;
-            notifyPropertyChanged(BR.v7);
-         }
-     
-     
-         /**
-         * Gets the ColorCatalogCode.
-         *
-         * return the ColorCatalogCode
-         */
-         @Bindable
-         public int getColorCatalogCode()
-         {
-            return colorCatalogCode;
-         }
-
-         /**
-         * Sets the ColorCatalogCode.
-         *
-         * @param colorCatalogCode the ColorCatalogCode
-         */
-         public void setColorCatalogCode(int colorCatalogCode)
-         {
-            this.colorCatalogCode = colorCatalogCode;
-            notifyPropertyChanged(BR.colorCatalogCode);
-         }
-     
-     
-         /**
-         * Gets the ColorCatalog.
-         *
-         * return the ColorCatalog
-         */
-         @Bindable
-         public ColorCatalog getColorCatalog()
-         {
-            return colorCatalog;
-         }
-
-         /**
-         * Sets the ColorCatalog.
-         *
-         * @param colorCatalog the ColorCatalog
-         */
-         public void setColorCatalog(ColorCatalog colorCatalog)
-         {
-            this.colorCatalog = colorCatalog;
-            notifyPropertyChanged(BR.colorCatalog);
-         }
-     
-     
-         /**
-         * Gets the ColorSpace.
-         *
-         * return the ColorSpace
-         */
-         @Bindable
-         public ColorSpace getColorSpace()
-         {
-            return colorSpace;
-         }
-
-         /**
-         * Sets the ColorSpace.
-         *
-         * @param colorSpace the ColorSpace
-         */
-         public void setColorSpace(ColorSpace colorSpace)
-         {
-            this.colorSpace = colorSpace;
-            notifyPropertyChanged(BR.colorSpace);
-         }
-     
-     
-         /**
-         * Gets the Segment.
-         *
-         * return the Segment
-         */
-         @Bindable
-         public Segment getSegment()
-         {
-            return segment;
-         }
-
-         /**
-         * Sets the Segment.
-         *
-         * @param segment the Segment
-         */
-         public void setSegment(Segment segment)
-         {
-            this.segment = segment;
-            notifyPropertyChanged(BR.segment);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CartridgeType.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CartridgeType.java
deleted file mode 100644
index b25fc4e51..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CartridgeType.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "CARTRIDGE_TYPES", database = TangoDB.class, cachingEnabled = true)
-public class CartridgeType extends CartridgeTypeBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CartridgeTypeBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CartridgeTypeBase.java
deleted file mode 100644
index 53ed798c1..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CartridgeTypeBase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class CartridgeTypeBase extends Entity 
-    {
-    
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cat.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cat.java
deleted file mode 100644
index 78a78022c..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cat.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "CATS", database = TangoDB.class, cachingEnabled = true)
-public class Cat extends CatBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CatBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CatBase.java
deleted file mode 100644
index 8d7c0ae3d..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CatBase.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class CatBase extends Entity 
-    {
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DATA")
-            private byte[] data;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "LIQUID_TYPE_GUID", foreignKeyColumnName = "GUID")})
-            private LiquidType liquidType;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "MACHINE_GUID", foreignKeyColumnName = "GUID")})
-            private Machine machine;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "RML_GUID", foreignKeyColumnName = "GUID")})
-            private Rml rml;
-
-    
-
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Data.
-         *
-         * return the Data
-         */
-         @Bindable
-         public byte[] getData()
-         {
-            return data;
-         }
-
-         /**
-         * Sets the Data.
-         *
-         * @param data the Data
-         */
-         public void setData(byte[] data)
-         {
-            this.data = data;
-            notifyPropertyChanged(BR.data);
-         }
-     
-     
-         /**
-         * Gets the LiquidType.
-         *
-         * return the LiquidType
-         */
-         @Bindable
-         public LiquidType getLiquidType()
-         {
-            return liquidType;
-         }
-
-         /**
-         * Sets the LiquidType.
-         *
-         * @param liquidType the LiquidType
-         */
-         public void setLiquidType(LiquidType liquidType)
-         {
-            this.liquidType = liquidType;
-            notifyPropertyChanged(BR.liquidType);
-         }
-     
-     
-         /**
-         * Gets the Machine.
-         *
-         * return the Machine
-         */
-         @Bindable
-         public Machine getMachine()
-         {
-            return machine;
-         }
-
-         /**
-         * Sets the Machine.
-         *
-         * @param machine the Machine
-         */
-         public void setMachine(Machine machine)
-         {
-            this.machine = machine;
-            notifyPropertyChanged(BR.machine);
-         }
-     
-     
-         /**
-         * Gets the Rml.
-         *
-         * return the Rml
-         */
-         @Bindable
-         public Rml getRml()
-         {
-            return rml;
-         }
-
-         /**
-         * Sets the Rml.
-         *
-         * @param rml the Rml
-         */
-         public void setRml(Rml rml)
-         {
-            this.rml = rml;
-            notifyPropertyChanged(BR.rml);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cct.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cct.java
deleted file mode 100644
index f3a94048a..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cct.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "CCTS", database = TangoDB.class, cachingEnabled = true)
-public class Cct extends CctBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CctBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CctBase.java
deleted file mode 100644
index 10d07e209..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CctBase.java
+++ /dev/null
@@ -1,239 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class CctBase extends Entity 
-    {
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-    
-            @Column(name = "FORWARD_FILE_NAME")
-            private String forwardFileName;
-
-    
-    
-            @Column(name = "INVERSE_FILE_NAME")
-            private String inverseFileName;
-
-    
-    
-            @Column(name = "FORWARD_DATA")
-            private byte[] forwardData;
-
-    
-    
-            @Column(name = "INVERSE_DATA")
-            private byte[] inverseData;
-
-    
-    
-            @Column(name = "VERSION")
-            private double version;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "RML_GUID", foreignKeyColumnName = "GUID")})
-            private Rml rml;
-
-    
-
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-     
-         /**
-         * Gets the ForwardFileName.
-         *
-         * return the ForwardFileName
-         */
-         @Bindable
-         public String getForwardFileName()
-         {
-            return forwardFileName;
-         }
-
-         /**
-         * Sets the ForwardFileName.
-         *
-         * @param forwardFileName the ForwardFileName
-         */
-         public void setForwardFileName(String forwardFileName)
-         {
-            this.forwardFileName = forwardFileName;
-            notifyPropertyChanged(BR.forwardFileName);
-         }
-     
-     
-         /**
-         * Gets the InverseFileName.
-         *
-         * return the InverseFileName
-         */
-         @Bindable
-         public String getInverseFileName()
-         {
-            return inverseFileName;
-         }
-
-         /**
-         * Sets the InverseFileName.
-         *
-         * @param inverseFileName the InverseFileName
-         */
-         public void setInverseFileName(String inverseFileName)
-         {
-            this.inverseFileName = inverseFileName;
-            notifyPropertyChanged(BR.inverseFileName);
-         }
-     
-     
-         /**
-         * Gets the ForwardData.
-         *
-         * return the ForwardData
-         */
-         @Bindable
-         public byte[] getForwardData()
-         {
-            return forwardData;
-         }
-
-         /**
-         * Sets the ForwardData.
-         *
-         * @param forwardData the ForwardData
-         */
-         public void setForwardData(byte[] forwardData)
-         {
-            this.forwardData = forwardData;
-            notifyPropertyChanged(BR.forwardData);
-         }
-     
-     
-         /**
-         * Gets the InverseData.
-         *
-         * return the InverseData
-         */
-         @Bindable
-         public byte[] getInverseData()
-         {
-            return inverseData;
-         }
-
-         /**
-         * Sets the InverseData.
-         *
-         * @param inverseData the InverseData
-         */
-         public void setInverseData(byte[] inverseData)
-         {
-            this.inverseData = inverseData;
-            notifyPropertyChanged(BR.inverseData);
-         }
-     
-     
-         /**
-         * Gets the Version.
-         *
-         * return the Version
-         */
-         @Bindable
-         public double getVersion()
-         {
-            return version;
-         }
-
-         /**
-         * Sets the Version.
-         *
-         * @param version the Version
-         */
-         public void setVersion(double version)
-         {
-            this.version = version;
-            notifyPropertyChanged(BR.version);
-         }
-     
-     
-         /**
-         * Gets the Rml.
-         *
-         * return the Rml
-         */
-         @Bindable
-         public Rml getRml()
-         {
-            return rml;
-         }
-
-         /**
-         * Sets the Rml.
-         *
-         * @param rml the Rml
-         */
-         public void setRml(Rml rml)
-         {
-            this.rml = rml;
-            notifyPropertyChanged(BR.rml);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorCatalog.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorCatalog.java
deleted file mode 100644
index 58efc626d..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorCatalog.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "COLOR_CATALOGS", database = TangoDB.class, cachingEnabled = true)
-public class ColorCatalog extends ColorCatalogBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorCatalogBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorCatalogBase.java
deleted file mode 100644
index 6fcbd8285..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorCatalogBase.java
+++ /dev/null
@@ -1,603 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class ColorCatalogBase extends Entity 
-    {
-    
-            @Column(name = "COLOR_CODE")
-            private int colorCode;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "CYAN")
-            private double cyan;
-
-    
-    
-            @Column(name = "MAGENTA")
-            private double magenta;
-
-    
-    
-            @Column(name = "YELLOW")
-            private double yellow;
-
-    
-    
-            @Column(name = "BLACK")
-            private double black;
-
-    
-    
-            @Column(name = "RED")
-            private int red;
-
-    
-    
-            @Column(name = "GREEN")
-            private int green;
-
-    
-    
-            @Column(name = "BLUE")
-            private int blue;
-
-    
-    
-            @Column(name = "L")
-            private double l;
-
-    
-    
-            @Column(name = "A")
-            private double a;
-
-    
-    
-            @Column(name = "B")
-            private double b;
-
-    
-    
-            @Column(name = "V0")
-            private double v0;
-
-    
-    
-            @Column(name = "V1")
-            private double v1;
-
-    
-    
-            @Column(name = "V2")
-            private double v2;
-
-    
-    
-            @Column(name = "V3")
-            private double v3;
-
-    
-    
-            @Column(name = "V4")
-            private double v4;
-
-    
-    
-            @Column(name = "V5")
-            private double v5;
-
-    
-    
-            @Column(name = "V6")
-            private double v6;
-
-    
-    
-            @Column(name = "V7")
-            private double v7;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "COLOR_SPACE_GUID", foreignKeyColumnName = "GUID")})
-            private ColorSpace colorSpace;
-
-    
-
-     
-         /**
-         * Gets the ColorCode.
-         *
-         * return the ColorCode
-         */
-         @Bindable
-         public int getColorCode()
-         {
-            return colorCode;
-         }
-
-         /**
-         * Sets the ColorCode.
-         *
-         * @param colorCode the ColorCode
-         */
-         public void setColorCode(int colorCode)
-         {
-            this.colorCode = colorCode;
-            notifyPropertyChanged(BR.colorCode);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Cyan.
-         *
-         * return the Cyan
-         */
-         @Bindable
-         public double getCyan()
-         {
-            return cyan;
-         }
-
-         /**
-         * Sets the Cyan.
-         *
-         * @param cyan the Cyan
-         */
-         public void setCyan(double cyan)
-         {
-            this.cyan = cyan;
-            notifyPropertyChanged(BR.cyan);
-         }
-     
-     
-         /**
-         * Gets the Magenta.
-         *
-         * return the Magenta
-         */
-         @Bindable
-         public double getMagenta()
-         {
-            return magenta;
-         }
-
-         /**
-         * Sets the Magenta.
-         *
-         * @param magenta the Magenta
-         */
-         public void setMagenta(double magenta)
-         {
-            this.magenta = magenta;
-            notifyPropertyChanged(BR.magenta);
-         }
-     
-     
-         /**
-         * Gets the Yellow.
-         *
-         * return the Yellow
-         */
-         @Bindable
-         public double getYellow()
-         {
-            return yellow;
-         }
-
-         /**
-         * Sets the Yellow.
-         *
-         * @param yellow the Yellow
-         */
-         public void setYellow(double yellow)
-         {
-            this.yellow = yellow;
-            notifyPropertyChanged(BR.yellow);
-         }
-     
-     
-         /**
-         * Gets the Black.
-         *
-         * return the Black
-         */
-         @Bindable
-         public double getBlack()
-         {
-            return black;
-         }
-
-         /**
-         * Sets the Black.
-         *
-         * @param black the Black
-         */
-         public void setBlack(double black)
-         {
-            this.black = black;
-            notifyPropertyChanged(BR.black);
-         }
-     
-     
-         /**
-         * Gets the Red.
-         *
-         * return the Red
-         */
-         @Bindable
-         public int getRed()
-         {
-            return red;
-         }
-
-         /**
-         * Sets the Red.
-         *
-         * @param red the Red
-         */
-         public void setRed(int red)
-         {
-            this.red = red;
-            notifyPropertyChanged(BR.red);
-         }
-     
-     
-         /**
-         * Gets the Green.
-         *
-         * return the Green
-         */
-         @Bindable
-         public int getGreen()
-         {
-            return green;
-         }
-
-         /**
-         * Sets the Green.
-         *
-         * @param green the Green
-         */
-         public void setGreen(int green)
-         {
-            this.green = green;
-            notifyPropertyChanged(BR.green);
-         }
-     
-     
-         /**
-         * Gets the Blue.
-         *
-         * return the Blue
-         */
-         @Bindable
-         public int getBlue()
-         {
-            return blue;
-         }
-
-         /**
-         * Sets the Blue.
-         *
-         * @param blue the Blue
-         */
-         public void setBlue(int blue)
-         {
-            this.blue = blue;
-            notifyPropertyChanged(BR.blue);
-         }
-     
-     
-         /**
-         * Gets the L.
-         *
-         * return the L
-         */
-         @Bindable
-         public double getL()
-         {
-            return l;
-         }
-
-         /**
-         * Sets the L.
-         *
-         * @param l the L
-         */
-         public void setL(double l)
-         {
-            this.l = l;
-            notifyPropertyChanged(BR.l);
-         }
-     
-     
-         /**
-         * Gets the A.
-         *
-         * return the A
-         */
-         @Bindable
-         public double getA()
-         {
-            return a;
-         }
-
-         /**
-         * Sets the A.
-         *
-         * @param a the A
-         */
-         public void setA(double a)
-         {
-            this.a = a;
-            notifyPropertyChanged(BR.a);
-         }
-     
-     
-         /**
-         * Gets the B.
-         *
-         * return the B
-         */
-         @Bindable
-         public double getB()
-         {
-            return b;
-         }
-
-         /**
-         * Sets the B.
-         *
-         * @param b the B
-         */
-         public void setB(double b)
-         {
-            this.b = b;
-            notifyPropertyChanged(BR.b);
-         }
-     
-     
-         /**
-         * Gets the V0.
-         *
-         * return the V0
-         */
-         @Bindable
-         public double getV0()
-         {
-            return v0;
-         }
-
-         /**
-         * Sets the V0.
-         *
-         * @param v0 the V0
-         */
-         public void setV0(double v0)
-         {
-            this.v0 = v0;
-            notifyPropertyChanged(BR.v0);
-         }
-     
-     
-         /**
-         * Gets the V1.
-         *
-         * return the V1
-         */
-         @Bindable
-         public double getV1()
-         {
-            return v1;
-         }
-
-         /**
-         * Sets the V1.
-         *
-         * @param v1 the V1
-         */
-         public void setV1(double v1)
-         {
-            this.v1 = v1;
-            notifyPropertyChanged(BR.v1);
-         }
-     
-     
-         /**
-         * Gets the V2.
-         *
-         * return the V2
-         */
-         @Bindable
-         public double getV2()
-         {
-            return v2;
-         }
-
-         /**
-         * Sets the V2.
-         *
-         * @param v2 the V2
-         */
-         public void setV2(double v2)
-         {
-            this.v2 = v2;
-            notifyPropertyChanged(BR.v2);
-         }
-     
-     
-         /**
-         * Gets the V3.
-         *
-         * return the V3
-         */
-         @Bindable
-         public double getV3()
-         {
-            return v3;
-         }
-
-         /**
-         * Sets the V3.
-         *
-         * @param v3 the V3
-         */
-         public void setV3(double v3)
-         {
-            this.v3 = v3;
-            notifyPropertyChanged(BR.v3);
-         }
-     
-     
-         /**
-         * Gets the V4.
-         *
-         * return the V4
-         */
-         @Bindable
-         public double getV4()
-         {
-            return v4;
-         }
-
-         /**
-         * Sets the V4.
-         *
-         * @param v4 the V4
-         */
-         public void setV4(double v4)
-         {
-            this.v4 = v4;
-            notifyPropertyChanged(BR.v4);
-         }
-     
-     
-         /**
-         * Gets the V5.
-         *
-         * return the V5
-         */
-         @Bindable
-         public double getV5()
-         {
-            return v5;
-         }
-
-         /**
-         * Sets the V5.
-         *
-         * @param v5 the V5
-         */
-         public void setV5(double v5)
-         {
-            this.v5 = v5;
-            notifyPropertyChanged(BR.v5);
-         }
-     
-     
-         /**
-         * Gets the V6.
-         *
-         * return the V6
-         */
-         @Bindable
-         public double getV6()
-         {
-            return v6;
-         }
-
-         /**
-         * Sets the V6.
-         *
-         * @param v6 the V6
-         */
-         public void setV6(double v6)
-         {
-            this.v6 = v6;
-            notifyPropertyChanged(BR.v6);
-         }
-     
-     
-         /**
-         * Gets the V7.
-         *
-         * return the V7
-         */
-         @Bindable
-         public double getV7()
-         {
-            return v7;
-         }
-
-         /**
-         * Sets the V7.
-         *
-         * @param v7 the V7
-         */
-         public void setV7(double v7)
-         {
-            this.v7 = v7;
-            notifyPropertyChanged(BR.v7);
-         }
-     
-     
-         /**
-         * Gets the ColorSpace.
-         *
-         * return the ColorSpace
-         */
-         @Bindable
-         public ColorSpace getColorSpace()
-         {
-            return colorSpace;
-         }
-
-         /**
-         * Sets the ColorSpace.
-         *
-         * @param colorSpace the ColorSpace
-         */
-         public void setColorSpace(ColorSpace colorSpace)
-         {
-            this.colorSpace = colorSpace;
-            notifyPropertyChanged(BR.colorSpace);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorSpace.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorSpace.java
deleted file mode 100644
index 98fdae627..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorSpace.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "COLOR_SPACES", database = TangoDB.class, cachingEnabled = true)
-public class ColorSpace extends ColorSpaceBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorSpaceBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorSpaceBase.java
deleted file mode 100644
index 3b87e7b3a..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorSpaceBase.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class ColorSpaceBase extends Entity 
-    {
-    
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Configuration.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Configuration.java
deleted file mode 100644
index 5553c67e8..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Configuration.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "CONFIGURATIONS", database = TangoDB.class, cachingEnabled = true)
-public class Configuration extends ConfigurationBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ConfigurationBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ConfigurationBase.java
deleted file mode 100644
index 9a85aaaae..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ConfigurationBase.java
+++ /dev/null
@@ -1,267 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class ConfigurationBase extends Entity 
-    {
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "CREATION_DATE")
-            private DateTime creationDate;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "APPLICATION_DISPLAY_PANEL_VERSION_GUID", foreignKeyColumnName = "GUID")})
-            private ApplicationDisplayPanelVersion applicationDisplayPanelVersion;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "APPLICATION_FIRMWARE_VERSION_GUID", foreignKeyColumnName = "GUID")})
-            private ApplicationFirmwareVersion applicationFirmwareVersion;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "APPLICATION_OS_VERSION_GUID", foreignKeyColumnName = "GUID")})
-            private ApplicationOsVersion applicationOsVersion;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "APPLICATION_VERSION_GUID", foreignKeyColumnName = "GUID")})
-            private ApplicationVersion applicationVersion;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "EMBEDDED_FIRMWARE_VERSION_GUID", foreignKeyColumnName = "GUID")})
-            private EmbeddedFirmwareVersion embeddedFirmwareVersion;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "EMBEDDED_SOFTWARE_VERSION_GUID", foreignKeyColumnName = "GUID")})
-            private EmbeddedSoftwareVersion embeddedSoftwareVersion;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "HARDWARE_VERSION_GUID", foreignKeyColumnName = "GUID")})
-            private HardwareVersion hardwareVersion;
-
-    
-
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the CreationDate.
-         *
-         * return the CreationDate
-         */
-         @Bindable
-         public DateTime getCreationDate()
-         {
-            return creationDate;
-         }
-
-         /**
-         * Sets the CreationDate.
-         *
-         * @param creationDate the CreationDate
-         */
-         public void setCreationDate(DateTime creationDate)
-         {
-            this.creationDate = creationDate;
-            notifyPropertyChanged(BR.creationDate);
-         }
-     
-     
-         /**
-         * Gets the ApplicationDisplayPanelVersion.
-         *
-         * return the ApplicationDisplayPanelVersion
-         */
-         @Bindable
-         public ApplicationDisplayPanelVersion getApplicationDisplayPanelVersion()
-         {
-            return applicationDisplayPanelVersion;
-         }
-
-         /**
-         * Sets the ApplicationDisplayPanelVersion.
-         *
-         * @param applicationDisplayPanelVersion the ApplicationDisplayPanelVersion
-         */
-         public void setApplicationDisplayPanelVersion(ApplicationDisplayPanelVersion applicationDisplayPanelVersion)
-         {
-            this.applicationDisplayPanelVersion = applicationDisplayPanelVersion;
-            notifyPropertyChanged(BR.applicationDisplayPanelVersion);
-         }
-     
-     
-         /**
-         * Gets the ApplicationFirmwareVersion.
-         *
-         * return the ApplicationFirmwareVersion
-         */
-         @Bindable
-         public ApplicationFirmwareVersion getApplicationFirmwareVersion()
-         {
-            return applicationFirmwareVersion;
-         }
-
-         /**
-         * Sets the ApplicationFirmwareVersion.
-         *
-         * @param applicationFirmwareVersion the ApplicationFirmwareVersion
-         */
-         public void setApplicationFirmwareVersion(ApplicationFirmwareVersion applicationFirmwareVersion)
-         {
-            this.applicationFirmwareVersion = applicationFirmwareVersion;
-            notifyPropertyChanged(BR.applicationFirmwareVersion);
-         }
-     
-     
-         /**
-         * Gets the ApplicationOsVersion.
-         *
-         * return the ApplicationOsVersion
-         */
-         @Bindable
-         public ApplicationOsVersion getApplicationOsVersion()
-         {
-            return applicationOsVersion;
-         }
-
-         /**
-         * Sets the ApplicationOsVersion.
-         *
-         * @param applicationOsVersion the ApplicationOsVersion
-         */
-         public void setApplicationOsVersion(ApplicationOsVersion applicationOsVersion)
-         {
-            this.applicationOsVersion = applicationOsVersion;
-            notifyPropertyChanged(BR.applicationOsVersion);
-         }
-     
-     
-         /**
-         * Gets the ApplicationVersion.
-         *
-         * return the ApplicationVersion
-         */
-         @Bindable
-         public ApplicationVersion getApplicationVersion()
-         {
-            return applicationVersion;
-         }
-
-         /**
-         * Sets the ApplicationVersion.
-         *
-         * @param applicationVersion the ApplicationVersion
-         */
-         public void setApplicationVersion(ApplicationVersion applicationVersion)
-         {
-            this.applicationVersion = applicationVersion;
-            notifyPropertyChanged(BR.applicationVersion);
-         }
-     
-     
-         /**
-         * Gets the EmbeddedFirmwareVersion.
-         *
-         * return the EmbeddedFirmwareVersion
-         */
-         @Bindable
-         public EmbeddedFirmwareVersion getEmbeddedFirmwareVersion()
-         {
-            return embeddedFirmwareVersion;
-         }
-
-         /**
-         * Sets the EmbeddedFirmwareVersion.
-         *
-         * @param embeddedFirmwareVersion the EmbeddedFirmwareVersion
-         */
-         public void setEmbeddedFirmwareVersion(EmbeddedFirmwareVersion embeddedFirmwareVersion)
-         {
-            this.embeddedFirmwareVersion = embeddedFirmwareVersion;
-            notifyPropertyChanged(BR.embeddedFirmwareVersion);
-         }
-     
-     
-         /**
-         * Gets the EmbeddedSoftwareVersion.
-         *
-         * return the EmbeddedSoftwareVersion
-         */
-         @Bindable
-         public EmbeddedSoftwareVersion getEmbeddedSoftwareVersion()
-         {
-            return embeddedSoftwareVersion;
-         }
-
-         /**
-         * Sets the EmbeddedSoftwareVersion.
-         *
-         * @param embeddedSoftwareVersion the EmbeddedSoftwareVersion
-         */
-         public void setEmbeddedSoftwareVersion(EmbeddedSoftwareVersion embeddedSoftwareVersion)
-         {
-            this.embeddedSoftwareVersion = embeddedSoftwareVersion;
-            notifyPropertyChanged(BR.embeddedSoftwareVersion);
-         }
-     
-     
-         /**
-         * Gets the HardwareVersion.
-         *
-         * return the HardwareVersion
-         */
-         @Bindable
-         public HardwareVersion getHardwareVersion()
-         {
-            return hardwareVersion;
-         }
-
-         /**
-         * Sets the HardwareVersion.
-         *
-         * @param hardwareVersion the HardwareVersion
-         */
-         public void setHardwareVersion(HardwareVersion hardwareVersion)
-         {
-            this.hardwareVersion = hardwareVersion;
-            notifyPropertyChanged(BR.hardwareVersion);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Contact.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Contact.java
deleted file mode 100644
index cad78abe5..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Contact.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "CONTACTS", database = TangoDB.class, cachingEnabled = true)
-public class Contact extends ContactBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ContactBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ContactBase.java
deleted file mode 100644
index daf4d4483..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ContactBase.java
+++ /dev/null
@@ -1,211 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class ContactBase extends Entity 
-    {
-    
-            @Column(name = "DELETED")
-            private boolean deleted;
-
-    
-    
-            @Column(name = "FIRST_NAME")
-            private String firstName;
-
-    
-    
-            @Column(name = "LAST_NAME")
-            private String lastName;
-
-    
-    
-            @Column(name = "FULL_NAME")
-            private String fullName;
-
-    
-    
-            @Column(name = "EMAIL")
-            private String email;
-
-    
-    
-            @Column(name = "PHONE_NUMBER")
-            private String phoneNumber;
-
-    
-    
-            @Column(name = "FAX")
-            private String fax;
-
-    
-
-     
-         /**
-         * Gets the Deleted.
-         *
-         * return the Deleted
-         */
-         @Bindable
-         public boolean isDeleted()
-         {
-            return deleted;
-         }
-
-         /**
-         * Sets the Deleted.
-         *
-         * @param deleted the Deleted
-         */
-         public void setDeleted(boolean deleted)
-         {
-            this.deleted = deleted;
-            notifyPropertyChanged(BR.deleted);
-         }
-     
-     
-         /**
-         * Gets the FirstName.
-         *
-         * return the FirstName
-         */
-         @Bindable
-         public String getFirstName()
-         {
-            return firstName;
-         }
-
-         /**
-         * Sets the FirstName.
-         *
-         * @param firstName the FirstName
-         */
-         public void setFirstName(String firstName)
-         {
-            this.firstName = firstName;
-            notifyPropertyChanged(BR.firstName);
-         }
-     
-     
-         /**
-         * Gets the LastName.
-         *
-         * return the LastName
-         */
-         @Bindable
-         public String getLastName()
-         {
-            return lastName;
-         }
-
-         /**
-         * Sets the LastName.
-         *
-         * @param lastName the LastName
-         */
-         public void setLastName(String lastName)
-         {
-            this.lastName = lastName;
-            notifyPropertyChanged(BR.lastName);
-         }
-     
-     
-         /**
-         * Gets the FullName.
-         *
-         * return the FullName
-         */
-         @Bindable
-         public String getFullName()
-         {
-            return fullName;
-         }
-
-         /**
-         * Sets the FullName.
-         *
-         * @param fullName the FullName
-         */
-         public void setFullName(String fullName)
-         {
-            this.fullName = fullName;
-            notifyPropertyChanged(BR.fullName);
-         }
-     
-     
-         /**
-         * Gets the Email.
-         *
-         * return the Email
-         */
-         @Bindable
-         public String getEmail()
-         {
-            return email;
-         }
-
-         /**
-         * Sets the Email.
-         *
-         * @param email the Email
-         */
-         public void setEmail(String email)
-         {
-            this.email = email;
-            notifyPropertyChanged(BR.email);
-         }
-     
-     
-         /**
-         * Gets the PhoneNumber.
-         *
-         * return the PhoneNumber
-         */
-         @Bindable
-         public String getPhoneNumber()
-         {
-            return phoneNumber;
-         }
-
-         /**
-         * Sets the PhoneNumber.
-         *
-         * @param phoneNumber the PhoneNumber
-         */
-         public void setPhoneNumber(String phoneNumber)
-         {
-            this.phoneNumber = phoneNumber;
-            notifyPropertyChanged(BR.phoneNumber);
-         }
-     
-     
-         /**
-         * Gets the Fax.
-         *
-         * return the Fax
-         */
-         @Bindable
-         public String getFax()
-         {
-            return fax;
-         }
-
-         /**
-         * Sets the Fax.
-         *
-         * @param fax the Fax
-         */
-         public void setFax(String fax)
-         {
-            this.fax = fax;
-            notifyPropertyChanged(BR.fax);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/DispenserType.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/DispenserType.java
deleted file mode 100644
index 62ab942bd..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/DispenserType.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "DISPENSER_TYPES", database = TangoDB.class, cachingEnabled = true)
-public class DispenserType extends DispenserTypeBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/DispenserTypeBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/DispenserTypeBase.java
deleted file mode 100644
index eaf42ba44..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/DispenserTypeBase.java
+++ /dev/null
@@ -1,463 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class DispenserTypeBase extends Entity 
-    {
-    
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "NL_PER_PULSE")
-            private double nlPerPulse;
-
-    
-    
-            @Column(name = "CAPACITY")
-            private double capacity;
-
-    
-    
-            @Column(name = "MIN_FREQUENCY")
-            private int minFrequency;
-
-    
-    
-            @Column(name = "MAX_FREQUENCY")
-            private int maxFrequency;
-
-    
-    
-            @Column(name = "MIN_MICRO_STEP")
-            private int minMicroStep;
-
-    
-    
-            @Column(name = "MAX_MICRO_STEP")
-            private int maxMicroStep;
-
-    
-    
-            @Column(name = "CORRECTION_GAIN")
-            private double correctionGain;
-
-    
-    
-            @Column(name = "RATIO_TO_DRYER_SPEED")
-            private double ratioToDryerSpeed;
-
-    
-    
-            @Column(name = "KP")
-            private double kp;
-
-    
-    
-            @Column(name = "KI")
-            private double ki;
-
-    
-    
-            @Column(name = "KD")
-            private double kd;
-
-    
-    
-            @Column(name = "CHANGE_SLOPE")
-            private double changeSlope;
-
-    
-    
-            @Column(name = "HIGH_LENGTH_MICRO_SECOND")
-            private double highLengthMicroSecond;
-
-    
-    
-            @Column(name = "CONTROL_TIMING")
-            private int controlTiming;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the NlPerPulse.
-         *
-         * return the NlPerPulse
-         */
-         @Bindable
-         public double getNlPerPulse()
-         {
-            return nlPerPulse;
-         }
-
-         /**
-         * Sets the NlPerPulse.
-         *
-         * @param nlPerPulse the NlPerPulse
-         */
-         public void setNlPerPulse(double nlPerPulse)
-         {
-            this.nlPerPulse = nlPerPulse;
-            notifyPropertyChanged(BR.nlPerPulse);
-         }
-     
-     
-         /**
-         * Gets the Capacity.
-         *
-         * return the Capacity
-         */
-         @Bindable
-         public double getCapacity()
-         {
-            return capacity;
-         }
-
-         /**
-         * Sets the Capacity.
-         *
-         * @param capacity the Capacity
-         */
-         public void setCapacity(double capacity)
-         {
-            this.capacity = capacity;
-            notifyPropertyChanged(BR.capacity);
-         }
-     
-     
-         /**
-         * Gets the MinFrequency.
-         *
-         * return the MinFrequency
-         */
-         @Bindable
-         public int getMinFrequency()
-         {
-            return minFrequency;
-         }
-
-         /**
-         * Sets the MinFrequency.
-         *
-         * @param minFrequency the MinFrequency
-         */
-         public void setMinFrequency(int minFrequency)
-         {
-            this.minFrequency = minFrequency;
-            notifyPropertyChanged(BR.minFrequency);
-         }
-     
-     
-         /**
-         * Gets the MaxFrequency.
-         *
-         * return the MaxFrequency
-         */
-         @Bindable
-         public int getMaxFrequency()
-         {
-            return maxFrequency;
-         }
-
-         /**
-         * Sets the MaxFrequency.
-         *
-         * @param maxFrequency the MaxFrequency
-         */
-         public void setMaxFrequency(int maxFrequency)
-         {
-            this.maxFrequency = maxFrequency;
-            notifyPropertyChanged(BR.maxFrequency);
-         }
-     
-     
-         /**
-         * Gets the MinMicroStep.
-         *
-         * return the MinMicroStep
-         */
-         @Bindable
-         public int getMinMicroStep()
-         {
-            return minMicroStep;
-         }
-
-         /**
-         * Sets the MinMicroStep.
-         *
-         * @param minMicroStep the MinMicroStep
-         */
-         public void setMinMicroStep(int minMicroStep)
-         {
-            this.minMicroStep = minMicroStep;
-            notifyPropertyChanged(BR.minMicroStep);
-         }
-     
-     
-         /**
-         * Gets the MaxMicroStep.
-         *
-         * return the MaxMicroStep
-         */
-         @Bindable
-         public int getMaxMicroStep()
-         {
-            return maxMicroStep;
-         }
-
-         /**
-         * Sets the MaxMicroStep.
-         *
-         * @param maxMicroStep the MaxMicroStep
-         */
-         public void setMaxMicroStep(int maxMicroStep)
-         {
-            this.maxMicroStep = maxMicroStep;
-            notifyPropertyChanged(BR.maxMicroStep);
-         }
-     
-     
-         /**
-         * Gets the CorrectionGain.
-         *
-         * return the CorrectionGain
-         */
-         @Bindable
-         public double getCorrectionGain()
-         {
-            return correctionGain;
-         }
-
-         /**
-         * Sets the CorrectionGain.
-         *
-         * @param correctionGain the CorrectionGain
-         */
-         public void setCorrectionGain(double correctionGain)
-         {
-            this.correctionGain = correctionGain;
-            notifyPropertyChanged(BR.correctionGain);
-         }
-     
-     
-         /**
-         * Gets the RatioToDryerSpeed.
-         *
-         * return the RatioToDryerSpeed
-         */
-         @Bindable
-         public double getRatioToDryerSpeed()
-         {
-            return ratioToDryerSpeed;
-         }
-
-         /**
-         * Sets the RatioToDryerSpeed.
-         *
-         * @param ratioToDryerSpeed the RatioToDryerSpeed
-         */
-         public void setRatioToDryerSpeed(double ratioToDryerSpeed)
-         {
-            this.ratioToDryerSpeed = ratioToDryerSpeed;
-            notifyPropertyChanged(BR.ratioToDryerSpeed);
-         }
-     
-     
-         /**
-         * Gets the Kp.
-         *
-         * return the Kp
-         */
-         @Bindable
-         public double getKp()
-         {
-            return kp;
-         }
-
-         /**
-         * Sets the Kp.
-         *
-         * @param kp the Kp
-         */
-         public void setKp(double kp)
-         {
-            this.kp = kp;
-            notifyPropertyChanged(BR.kp);
-         }
-     
-     
-         /**
-         * Gets the Ki.
-         *
-         * return the Ki
-         */
-         @Bindable
-         public double getKi()
-         {
-            return ki;
-         }
-
-         /**
-         * Sets the Ki.
-         *
-         * @param ki the Ki
-         */
-         public void setKi(double ki)
-         {
-            this.ki = ki;
-            notifyPropertyChanged(BR.ki);
-         }
-     
-     
-         /**
-         * Gets the Kd.
-         *
-         * return the Kd
-         */
-         @Bindable
-         public double getKd()
-         {
-            return kd;
-         }
-
-         /**
-         * Sets the Kd.
-         *
-         * @param kd the Kd
-         */
-         public void setKd(double kd)
-         {
-            this.kd = kd;
-            notifyPropertyChanged(BR.kd);
-         }
-     
-     
-         /**
-         * Gets the ChangeSlope.
-         *
-         * return the ChangeSlope
-         */
-         @Bindable
-         public double getChangeSlope()
-         {
-            return changeSlope;
-         }
-
-         /**
-         * Sets the ChangeSlope.
-         *
-         * @param changeSlope the ChangeSlope
-         */
-         public void setChangeSlope(double changeSlope)
-         {
-            this.changeSlope = changeSlope;
-            notifyPropertyChanged(BR.changeSlope);
-         }
-     
-     
-         /**
-         * Gets the HighLengthMicroSecond.
-         *
-         * return the HighLengthMicroSecond
-         */
-         @Bindable
-         public double getHighLengthMicroSecond()
-         {
-            return highLengthMicroSecond;
-         }
-
-         /**
-         * Sets the HighLengthMicroSecond.
-         *
-         * @param highLengthMicroSecond the HighLengthMicroSecond
-         */
-         public void setHighLengthMicroSecond(double highLengthMicroSecond)
-         {
-            this.highLengthMicroSecond = highLengthMicroSecond;
-            notifyPropertyChanged(BR.highLengthMicroSecond);
-         }
-     
-     
-         /**
-         * Gets the ControlTiming.
-         *
-         * return the ControlTiming
-         */
-         @Bindable
-         public int getControlTiming()
-         {
-            return controlTiming;
-         }
-
-         /**
-         * Sets the ControlTiming.
-         *
-         * @param controlTiming the ControlTiming
-         */
-         public void setControlTiming(int controlTiming)
-         {
-            this.controlTiming = controlTiming;
-            notifyPropertyChanged(BR.controlTiming);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedFirmwareVersion.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedFirmwareVersion.java
deleted file mode 100644
index ba5b0765c..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedFirmwareVersion.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "EMBEDDED_FIRMWARE_VERSIONS", database = TangoDB.class, cachingEnabled = true)
-public class EmbeddedFirmwareVersion extends EmbeddedFirmwareVersionBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedFirmwareVersionBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedFirmwareVersionBase.java
deleted file mode 100644
index 96399ca0a..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedFirmwareVersionBase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class EmbeddedFirmwareVersionBase extends Entity 
-    {
-    
-            @Column(name = "VERSION")
-            private double version;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-
-     
-         /**
-         * Gets the Version.
-         *
-         * return the Version
-         */
-         @Bindable
-         public double getVersion()
-         {
-            return version;
-         }
-
-         /**
-         * Sets the Version.
-         *
-         * @param version the Version
-         */
-         public void setVersion(double version)
-         {
-            this.version = version;
-            notifyPropertyChanged(BR.version);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedSoftwareVersion.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedSoftwareVersion.java
deleted file mode 100644
index 493c8020a..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedSoftwareVersion.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "EMBEDDED_SOFTWARE_VERSIONS", database = TangoDB.class, cachingEnabled = true)
-public class EmbeddedSoftwareVersion extends EmbeddedSoftwareVersionBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedSoftwareVersionBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedSoftwareVersionBase.java
deleted file mode 100644
index 1f620a844..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedSoftwareVersionBase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class EmbeddedSoftwareVersionBase extends Entity 
-    {
-    
-            @Column(name = "VERSION")
-            private double version;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-
-     
-         /**
-         * Gets the Version.
-         *
-         * return the Version
-         */
-         @Bindable
-         public double getVersion()
-         {
-            return version;
-         }
-
-         /**
-         * Sets the Version.
-         *
-         * @param version the Version
-         */
-         public void setVersion(double version)
-         {
-            this.version = version;
-            notifyPropertyChanged(BR.version);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventType.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventType.java
deleted file mode 100644
index c91b1c09e..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventType.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.OneToMany;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.sql.language.SQLite;
-import com.twine.tango.dal.TangoDB;
-import com.twine.tango.dal.dao.TangoDAO;
-
-import java.util.ArrayList;
-import java.util.List;
-import static br.com.zbra.androidlinq.Linq.stream;
-
-
-@Table(name = "EVENT_TYPES", database = TangoDB.class, cachingEnabled = true)
-public class EventType extends EventTypeBase
-{
-    private List<ActionType> actionTypes;
-    
-    public List<ActionType> getActionTypes()
-    {
-        if (actionTypes == null)
-        {
-            actionTypes = stream(SQLite.select().from(EventTypesAction.class).where(EventTypesAction_Table.EVENT_TYPE_GUID.eq(getGuid())).queryList()).
-                    select(x -> x.getActionType()).toList();
-        }
-        
-        return actionTypes;
-    }
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypeBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypeBase.java
deleted file mode 100644
index a9d629c52..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypeBase.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ColumnIgnore;
-import com.raizlabs.android.dbflow.annotation.ColumnMap;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-
-import org.joda.time.DateTime;
-
-import com.raizlabs.android.dbflow.annotation.InheritedColumn;
-import com.twine.tango.dal.Entity;
-
-import android.databinding.Bindable;
-
-import com.twine.tango.dal.BR;
-
-
-public abstract class EventTypeBase extends Entity
-{
-    @Column(name = "CODE")
-    private int code;
-    
-    
-    @Column(name = "NAME")
-    private String name;
-    
-    
-    @Column(name = "DESCRIPTION")
-    private String description;
-    
-    
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "EVENT_TYPES_GROUP_GUID", foreignKeyColumnName = "GUID")})
-    private EventTypesGroup eventTypesGroup;
-    
-    
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "EVENT_TYPES_CATEGORY_GUID", foreignKeyColumnName = "GUID")})
-    private EventTypesCategory eventTypesCategory;
-    
-    
-    /**
-     * Gets the Code.
-     * <p>
-     * return the Code
-     */
-    @Bindable
-    public int getCode()
-    {
-        return code;
-    }
-    
-    /**
-     * Sets the Code.
-     *
-     * @param code the Code
-     */
-    public void setCode(int code)
-    {
-        this.code = code;
-        notifyPropertyChanged(BR.code);
-    }
-    
-    
-    /**
-     * Gets the Name.
-     * <p>
-     * return the Name
-     */
-    @Bindable
-    public String getName()
-    {
-        return name;
-    }
-    
-    /**
-     * Sets the Name.
-     *
-     * @param name the Name
-     */
-    public void setName(String name)
-    {
-        this.name = name;
-        notifyPropertyChanged(BR.name);
-    }
-    
-    
-    /**
-     * Gets the Description.
-     * <p>
-     * return the Description
-     */
-    @Bindable
-    public String getDescription()
-    {
-        return description;
-    }
-    
-    /**
-     * Sets the Description.
-     *
-     * @param description the Description
-     */
-    public void setDescription(String description)
-    {
-        this.description = description;
-        notifyPropertyChanged(BR.description);
-    }
-    
-    
-    /**
-     * Gets the EventTypesGroup.
-     * <p>
-     * return the EventTypesGroup
-     */
-    @Bindable
-    public EventTypesGroup getEventTypesGroup()
-    {
-        return eventTypesGroup;
-    }
-    
-    /**
-     * Sets the EventTypesGroup.
-     *
-     * @param eventTypesGroup the EventTypesGroup
-     */
-    public void setEventTypesGroup(EventTypesGroup eventTypesGroup)
-    {
-        this.eventTypesGroup = eventTypesGroup;
-        notifyPropertyChanged(BR.eventTypesGroup);
-    }
-    
-    
-    /**
-     * Gets the EventTypesCategory.
-     * <p>
-     * return the EventTypesCategory
-     */
-    @Bindable
-    public EventTypesCategory getEventTypesCategory()
-    {
-        return eventTypesCategory;
-    }
-    
-    /**
-     * Sets the EventTypesCategory.
-     *
-     * @param eventTypesCategory the EventTypesCategory
-     */
-    public void setEventTypesCategory(EventTypesCategory eventTypesCategory)
-    {
-        this.eventTypesCategory = eventTypesCategory;
-        notifyPropertyChanged(BR.eventTypesCategory);
-    }
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesAction.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesAction.java
deleted file mode 100644
index a4b992130..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesAction.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "EVENT_TYPES_ACTIONS", database = TangoDB.class, cachingEnabled = true)
-public class EventTypesAction extends EventTypesActionBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesActionBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesActionBase.java
deleted file mode 100644
index f26d3e184..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesActionBase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-
-import org.joda.time.DateTime;
-
-import com.twine.tango.dal.Entity;
-
-import android.databinding.Bindable;
-
-import com.twine.tango.dal.BR;
-
-
-public abstract class EventTypesActionBase extends Entity
-{
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "ACTION_TYPE_GUID", foreignKeyColumnName = "GUID")})
-    private ActionType actionType;
-    
-    
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "EVENT_TYPE_GUID", foreignKeyColumnName = "GUID")})
-    private EventType eventType;
-    
-    
-    /**
-     * Gets the ActionType.
-     * <p>
-     * return the ActionType
-     */
-    @Bindable
-    public ActionType getActionType()
-    {
-        return actionType;
-    }
-    
-    /**
-     * Sets the ActionType.
-     *
-     * @param actionType the ActionType
-     */
-    public void setActionType(ActionType actionType)
-    {
-        this.actionType = actionType;
-        notifyPropertyChanged(BR.actionType);
-    }
-    
-    
-    /**
-     * Gets the EventType.
-     * <p>
-     * return the EventType
-     */
-    @Bindable
-    public EventType getEventType()
-    {
-        return eventType;
-    }
-    
-    /**
-     * Sets the EventType.
-     *
-     * @param eventType the EventType
-     */
-    public void setEventType(EventType eventType)
-    {
-        this.eventType = eventType;
-        notifyPropertyChanged(BR.eventType);
-    }
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesCategory.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesCategory.java
deleted file mode 100644
index 9b446812e..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesCategory.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "EVENT_TYPES_CATEGORIES", database = TangoDB.class, cachingEnabled = true)
-public class EventTypesCategory extends EventTypesCategoryBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesCategoryBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesCategoryBase.java
deleted file mode 100644
index cd8c5e96f..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesCategoryBase.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class EventTypesCategoryBase extends Entity 
-    {
-    
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesGroup.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesGroup.java
deleted file mode 100644
index 05ac72aa9..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesGroup.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "EVENT_TYPES_GROUPS", database = TangoDB.class, cachingEnabled = true)
-public class EventTypesGroup extends EventTypesGroupBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesGroupBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesGroupBase.java
deleted file mode 100644
index 429ac300c..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesGroupBase.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class EventTypesGroupBase extends Entity 
-    {
-    
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberShape.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberShape.java
deleted file mode 100644
index 185a2fc4a..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberShape.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "FIBER_SHAPES", database = TangoDB.class, cachingEnabled = true)
-public class FiberShape extends FiberShapeBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberShapeBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberShapeBase.java
deleted file mode 100644
index 4b77d1b9d..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberShapeBase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class FiberShapeBase extends Entity 
-    {
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "CODE")
-            private int code;
-
-    
-
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberSynth.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberSynth.java
deleted file mode 100644
index 8bc07151b..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberSynth.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "FIBER_SYNTHS", database = TangoDB.class, cachingEnabled = true)
-public class FiberSynth extends FiberSynthBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberSynthBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberSynthBase.java
deleted file mode 100644
index 5b9ef4df8..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberSynthBase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class FiberSynthBase extends Entity 
-    {
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "CODE")
-            private int code;
-
-    
-
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancer.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancer.java
deleted file mode 100644
index 25167d890..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancer.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "HARDWARE_DANCERS", database = TangoDB.class, cachingEnabled = true)
-public class HardwareDancer extends HardwareDancerBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancerBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancerBase.java
deleted file mode 100644
index 3f756950f..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancerBase.java
+++ /dev/null
@@ -1,183 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class HardwareDancerBase extends Entity 
-    {
-    
-            @Column(name = "GRADUAL")
-            private boolean gradual;
-
-    
-    
-            @Column(name = "K")
-            private double k;
-
-    
-    
-            @Column(name = "X")
-            private double x;
-
-    
-    
-            @Column(name = "PULSE_PER_MM_SPRING")
-            private int pulsePerMmSpring;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "HARDWARE_DANCER_TYPE_GUID", foreignKeyColumnName = "GUID")})
-            private HardwareDancerType hardwareDancerType;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "HARDWARE_VERSION_GUID", foreignKeyColumnName = "GUID")})
-            private HardwareVersion hardwareVersion;
-
-    
-
-     
-         /**
-         * Gets the Gradual.
-         *
-         * return the Gradual
-         */
-         @Bindable
-         public boolean isGradual()
-         {
-            return gradual;
-         }
-
-         /**
-         * Sets the Gradual.
-         *
-         * @param gradual the Gradual
-         */
-         public void setGradual(boolean gradual)
-         {
-            this.gradual = gradual;
-            notifyPropertyChanged(BR.gradual);
-         }
-     
-     
-         /**
-         * Gets the K.
-         *
-         * return the K
-         */
-         @Bindable
-         public double getK()
-         {
-            return k;
-         }
-
-         /**
-         * Sets the K.
-         *
-         * @param k the K
-         */
-         public void setK(double k)
-         {
-            this.k = k;
-            notifyPropertyChanged(BR.k);
-         }
-     
-     
-         /**
-         * Gets the X.
-         *
-         * return the X
-         */
-         @Bindable
-         public double getX()
-         {
-            return x;
-         }
-
-         /**
-         * Sets the X.
-         *
-         * @param x the X
-         */
-         public void setX(double x)
-         {
-            this.x = x;
-            notifyPropertyChanged(BR.x);
-         }
-     
-     
-         /**
-         * Gets the PulsePerMmSpring.
-         *
-         * return the PulsePerMmSpring
-         */
-         @Bindable
-         public int getPulsePerMmSpring()
-         {
-            return pulsePerMmSpring;
-         }
-
-         /**
-         * Sets the PulsePerMmSpring.
-         *
-         * @param pulsePerMmSpring the PulsePerMmSpring
-         */
-         public void setPulsePerMmSpring(int pulsePerMmSpring)
-         {
-            this.pulsePerMmSpring = pulsePerMmSpring;
-            notifyPropertyChanged(BR.pulsePerMmSpring);
-         }
-     
-     
-         /**
-         * Gets the HardwareDancerType.
-         *
-         * return the HardwareDancerType
-         */
-         @Bindable
-         public HardwareDancerType getHardwareDancerType()
-         {
-            return hardwareDancerType;
-         }
-
-         /**
-         * Sets the HardwareDancerType.
-         *
-         * @param hardwareDancerType the HardwareDancerType
-         */
-         public void setHardwareDancerType(HardwareDancerType hardwareDancerType)
-         {
-            this.hardwareDancerType = hardwareDancerType;
-            notifyPropertyChanged(BR.hardwareDancerType);
-         }
-     
-     
-         /**
-         * Gets the HardwareVersion.
-         *
-         * return the HardwareVersion
-         */
-         @Bindable
-         public HardwareVersion getHardwareVersion()
-         {
-            return hardwareVersion;
-         }
-
-         /**
-         * Sets the HardwareVersion.
-         *
-         * @param hardwareVersion the HardwareVersion
-         */
-         public void setHardwareVersion(HardwareVersion hardwareVersion)
-         {
-            this.hardwareVersion = hardwareVersion;
-            notifyPropertyChanged(BR.hardwareVersion);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancerType.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancerType.java
deleted file mode 100644
index 758dc32d3..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancerType.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "HARDWARE_DANCER_TYPES", database = TangoDB.class, cachingEnabled = true)
-public class HardwareDancerType extends HardwareDancerTypeBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancerTypeBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancerTypeBase.java
deleted file mode 100644
index ef92de00e..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancerTypeBase.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class HardwareDancerTypeBase extends Entity 
-    {
-    
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotor.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotor.java
deleted file mode 100644
index 2916aed44..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotor.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "HARDWARE_MOTORS", database = TangoDB.class, cachingEnabled = true)
-public class HardwareMotor extends HardwareMotorBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotorBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotorBase.java
deleted file mode 100644
index 86f26b9c1..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotorBase.java
+++ /dev/null
@@ -1,463 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class HardwareMotorBase extends Entity 
-    {
-    
-            @Column(name = "MIN_FREQUENCY")
-            private int minFrequency;
-
-    
-    
-            @Column(name = "MAX_FREQUENCY")
-            private int maxFrequency;
-
-    
-    
-            @Column(name = "MIN_MICRO_STEP")
-            private int minMicroStep;
-
-    
-    
-            @Column(name = "MAX_MICRO_STEP")
-            private int maxMicroStep;
-
-    
-    
-            @Column(name = "LINEAR_RATIO")
-            private double linearRatio;
-
-    
-    
-            @Column(name = "MEDIAN_POSITION")
-            private int medianPosition;
-
-    
-    
-            @Column(name = "CORRECTION_GAIN")
-            private double correctionGain;
-
-    
-    
-            @Column(name = "RATIO_TO_DRYER_SPEED")
-            private double ratioToDryerSpeed;
-
-    
-    
-            @Column(name = "KP")
-            private double kp;
-
-    
-    
-            @Column(name = "KI")
-            private double ki;
-
-    
-    
-            @Column(name = "KD")
-            private double kd;
-
-    
-    
-            @Column(name = "CHANGE_SLOPE")
-            private double changeSlope;
-
-    
-    
-            @Column(name = "HIGH_LENGTH_MICRO_SECOND")
-            private double highLengthMicroSecond;
-
-    
-    
-            @Column(name = "SPEED_MASTER")
-            private boolean speedMaster;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "HARDWARE_MOTOR_TYPE_GUID", foreignKeyColumnName = "GUID")})
-            private HardwareMotorType hardwareMotorType;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "HARDWARE_VERSION_GUID", foreignKeyColumnName = "GUID")})
-            private HardwareVersion hardwareVersion;
-
-    
-
-     
-         /**
-         * Gets the MinFrequency.
-         *
-         * return the MinFrequency
-         */
-         @Bindable
-         public int getMinFrequency()
-         {
-            return minFrequency;
-         }
-
-         /**
-         * Sets the MinFrequency.
-         *
-         * @param minFrequency the MinFrequency
-         */
-         public void setMinFrequency(int minFrequency)
-         {
-            this.minFrequency = minFrequency;
-            notifyPropertyChanged(BR.minFrequency);
-         }
-     
-     
-         /**
-         * Gets the MaxFrequency.
-         *
-         * return the MaxFrequency
-         */
-         @Bindable
-         public int getMaxFrequency()
-         {
-            return maxFrequency;
-         }
-
-         /**
-         * Sets the MaxFrequency.
-         *
-         * @param maxFrequency the MaxFrequency
-         */
-         public void setMaxFrequency(int maxFrequency)
-         {
-            this.maxFrequency = maxFrequency;
-            notifyPropertyChanged(BR.maxFrequency);
-         }
-     
-     
-         /**
-         * Gets the MinMicroStep.
-         *
-         * return the MinMicroStep
-         */
-         @Bindable
-         public int getMinMicroStep()
-         {
-            return minMicroStep;
-         }
-
-         /**
-         * Sets the MinMicroStep.
-         *
-         * @param minMicroStep the MinMicroStep
-         */
-         public void setMinMicroStep(int minMicroStep)
-         {
-            this.minMicroStep = minMicroStep;
-            notifyPropertyChanged(BR.minMicroStep);
-         }
-     
-     
-         /**
-         * Gets the MaxMicroStep.
-         *
-         * return the MaxMicroStep
-         */
-         @Bindable
-         public int getMaxMicroStep()
-         {
-            return maxMicroStep;
-         }
-
-         /**
-         * Sets the MaxMicroStep.
-         *
-         * @param maxMicroStep the MaxMicroStep
-         */
-         public void setMaxMicroStep(int maxMicroStep)
-         {
-            this.maxMicroStep = maxMicroStep;
-            notifyPropertyChanged(BR.maxMicroStep);
-         }
-     
-     
-         /**
-         * Gets the LinearRatio.
-         *
-         * return the LinearRatio
-         */
-         @Bindable
-         public double getLinearRatio()
-         {
-            return linearRatio;
-         }
-
-         /**
-         * Sets the LinearRatio.
-         *
-         * @param linearRatio the LinearRatio
-         */
-         public void setLinearRatio(double linearRatio)
-         {
-            this.linearRatio = linearRatio;
-            notifyPropertyChanged(BR.linearRatio);
-         }
-     
-     
-         /**
-         * Gets the MedianPosition.
-         *
-         * return the MedianPosition
-         */
-         @Bindable
-         public int getMedianPosition()
-         {
-            return medianPosition;
-         }
-
-         /**
-         * Sets the MedianPosition.
-         *
-         * @param medianPosition the MedianPosition
-         */
-         public void setMedianPosition(int medianPosition)
-         {
-            this.medianPosition = medianPosition;
-            notifyPropertyChanged(BR.medianPosition);
-         }
-     
-     
-         /**
-         * Gets the CorrectionGain.
-         *
-         * return the CorrectionGain
-         */
-         @Bindable
-         public double getCorrectionGain()
-         {
-            return correctionGain;
-         }
-
-         /**
-         * Sets the CorrectionGain.
-         *
-         * @param correctionGain the CorrectionGain
-         */
-         public void setCorrectionGain(double correctionGain)
-         {
-            this.correctionGain = correctionGain;
-            notifyPropertyChanged(BR.correctionGain);
-         }
-     
-     
-         /**
-         * Gets the RatioToDryerSpeed.
-         *
-         * return the RatioToDryerSpeed
-         */
-         @Bindable
-         public double getRatioToDryerSpeed()
-         {
-            return ratioToDryerSpeed;
-         }
-
-         /**
-         * Sets the RatioToDryerSpeed.
-         *
-         * @param ratioToDryerSpeed the RatioToDryerSpeed
-         */
-         public void setRatioToDryerSpeed(double ratioToDryerSpeed)
-         {
-            this.ratioToDryerSpeed = ratioToDryerSpeed;
-            notifyPropertyChanged(BR.ratioToDryerSpeed);
-         }
-     
-     
-         /**
-         * Gets the Kp.
-         *
-         * return the Kp
-         */
-         @Bindable
-         public double getKp()
-         {
-            return kp;
-         }
-
-         /**
-         * Sets the Kp.
-         *
-         * @param kp the Kp
-         */
-         public void setKp(double kp)
-         {
-            this.kp = kp;
-            notifyPropertyChanged(BR.kp);
-         }
-     
-     
-         /**
-         * Gets the Ki.
-         *
-         * return the Ki
-         */
-         @Bindable
-         public double getKi()
-         {
-            return ki;
-         }
-
-         /**
-         * Sets the Ki.
-         *
-         * @param ki the Ki
-         */
-         public void setKi(double ki)
-         {
-            this.ki = ki;
-            notifyPropertyChanged(BR.ki);
-         }
-     
-     
-         /**
-         * Gets the Kd.
-         *
-         * return the Kd
-         */
-         @Bindable
-         public double getKd()
-         {
-            return kd;
-         }
-
-         /**
-         * Sets the Kd.
-         *
-         * @param kd the Kd
-         */
-         public void setKd(double kd)
-         {
-            this.kd = kd;
-            notifyPropertyChanged(BR.kd);
-         }
-     
-     
-         /**
-         * Gets the ChangeSlope.
-         *
-         * return the ChangeSlope
-         */
-         @Bindable
-         public double getChangeSlope()
-         {
-            return changeSlope;
-         }
-
-         /**
-         * Sets the ChangeSlope.
-         *
-         * @param changeSlope the ChangeSlope
-         */
-         public void setChangeSlope(double changeSlope)
-         {
-            this.changeSlope = changeSlope;
-            notifyPropertyChanged(BR.changeSlope);
-         }
-     
-     
-         /**
-         * Gets the HighLengthMicroSecond.
-         *
-         * return the HighLengthMicroSecond
-         */
-         @Bindable
-         public double getHighLengthMicroSecond()
-         {
-            return highLengthMicroSecond;
-         }
-
-         /**
-         * Sets the HighLengthMicroSecond.
-         *
-         * @param highLengthMicroSecond the HighLengthMicroSecond
-         */
-         public void setHighLengthMicroSecond(double highLengthMicroSecond)
-         {
-            this.highLengthMicroSecond = highLengthMicroSecond;
-            notifyPropertyChanged(BR.highLengthMicroSecond);
-         }
-     
-     
-         /**
-         * Gets the SpeedMaster.
-         *
-         * return the SpeedMaster
-         */
-         @Bindable
-         public boolean isSpeedMaster()
-         {
-            return speedMaster;
-         }
-
-         /**
-         * Sets the SpeedMaster.
-         *
-         * @param speedMaster the SpeedMaster
-         */
-         public void setSpeedMaster(boolean speedMaster)
-         {
-            this.speedMaster = speedMaster;
-            notifyPropertyChanged(BR.speedMaster);
-         }
-     
-     
-         /**
-         * Gets the HardwareMotorType.
-         *
-         * return the HardwareMotorType
-         */
-         @Bindable
-         public HardwareMotorType getHardwareMotorType()
-         {
-            return hardwareMotorType;
-         }
-
-         /**
-         * Sets the HardwareMotorType.
-         *
-         * @param hardwareMotorType the HardwareMotorType
-         */
-         public void setHardwareMotorType(HardwareMotorType hardwareMotorType)
-         {
-            this.hardwareMotorType = hardwareMotorType;
-            notifyPropertyChanged(BR.hardwareMotorType);
-         }
-     
-     
-         /**
-         * Gets the HardwareVersion.
-         *
-         * return the HardwareVersion
-         */
-         @Bindable
-         public HardwareVersion getHardwareVersion()
-         {
-            return hardwareVersion;
-         }
-
-         /**
-         * Sets the HardwareVersion.
-         *
-         * @param hardwareVersion the HardwareVersion
-         */
-         public void setHardwareVersion(HardwareVersion hardwareVersion)
-         {
-            this.hardwareVersion = hardwareVersion;
-            notifyPropertyChanged(BR.hardwareVersion);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotorType.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotorType.java
deleted file mode 100644
index 1e1a725de..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotorType.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "HARDWARE_MOTOR_TYPES", database = TangoDB.class, cachingEnabled = true)
-public class HardwareMotorType extends HardwareMotorTypeBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotorTypeBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotorTypeBase.java
deleted file mode 100644
index 38a0835fe..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotorTypeBase.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class HardwareMotorTypeBase extends Entity 
-    {
-    
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControl.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControl.java
deleted file mode 100644
index 63bc62fdf..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControl.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "HARDWARE_PID_CONTROLS", database = TangoDB.class, cachingEnabled = true)
-public class HardwarePidControl extends HardwarePidControlBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControlBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControlBase.java
deleted file mode 100644
index a350f51f7..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControlBase.java
+++ /dev/null
@@ -1,463 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class HardwarePidControlBase extends Entity 
-    {
-    
-            @Column(name = "OUTPUT_PROPORTIONAL_POWER_LIMIT")
-            private int outputProportionalPowerLimit;
-
-    
-    
-            @Column(name = "OUTPUT_PROPORTIONAL_BAND")
-            private int outputProportionalBand;
-
-    
-    
-            @Column(name = "INTEGRAL_TIME")
-            private int integralTime;
-
-    
-    
-            @Column(name = "DERIVATIVE_TIME")
-            private int derivativeTime;
-
-    
-    
-            @Column(name = "SENSOR_CORRECTION_ADJUSTMENT")
-            private int sensorCorrectionAdjustment;
-
-    
-    
-            @Column(name = "SENSOR_MIN_VALUE")
-            private int sensorMinValue;
-
-    
-    
-            @Column(name = "SENSOR_MAX_VALUE")
-            private int sensorMaxValue;
-
-    
-    
-            @Column(name = "SET_POINT_RAMP_RATEOR_SOFT_START_RAMP")
-            private int pointRampRateorSoftStartRamp;
-
-    
-    
-            @Column(name = "SET_POINT_CONTROL_OUTPUT_RATE")
-            private int pointControlOutputRate;
-
-    
-    
-            @Column(name = "CONTROL_OUTPUT_TYPE")
-            private int controlOutputType;
-
-    
-    
-            @Column(name = "SSR_CONTROL_OUTPUT_TYPE")
-            private int ssrControlOutputType;
-
-    
-    
-            @Column(name = "OUTPUT_ON_OFF_HYSTERESIS_VALUE")
-            private int outputOnOffHysteresisValue;
-
-    
-    
-            @Column(name = "PROCESS_VARIABLE_SAMPLING_RATE")
-            private int processVariableSamplingRate;
-
-    
-    
-            @Column(name = "PV_INPUT_FILTER_FACTOR_MODE")
-            private int pvInputFilterFactorMode;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "HARDWARE_PID_CONTROL_TYPE_GUID", foreignKeyColumnName = "GUID")})
-            private HardwarePidControlType hardwarePidControlType;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "HARDWARE_VERSION_GUID", foreignKeyColumnName = "GUID")})
-            private HardwareVersion hardwareVersion;
-
-    
-
-     
-         /**
-         * Gets the OutputProportionalPowerLimit.
-         *
-         * return the OutputProportionalPowerLimit
-         */
-         @Bindable
-         public int getOutputProportionalPowerLimit()
-         {
-            return outputProportionalPowerLimit;
-         }
-
-         /**
-         * Sets the OutputProportionalPowerLimit.
-         *
-         * @param outputProportionalPowerLimit the OutputProportionalPowerLimit
-         */
-         public void setOutputProportionalPowerLimit(int outputProportionalPowerLimit)
-         {
-            this.outputProportionalPowerLimit = outputProportionalPowerLimit;
-            notifyPropertyChanged(BR.outputProportionalPowerLimit);
-         }
-     
-     
-         /**
-         * Gets the OutputProportionalBand.
-         *
-         * return the OutputProportionalBand
-         */
-         @Bindable
-         public int getOutputProportionalBand()
-         {
-            return outputProportionalBand;
-         }
-
-         /**
-         * Sets the OutputProportionalBand.
-         *
-         * @param outputProportionalBand the OutputProportionalBand
-         */
-         public void setOutputProportionalBand(int outputProportionalBand)
-         {
-            this.outputProportionalBand = outputProportionalBand;
-            notifyPropertyChanged(BR.outputProportionalBand);
-         }
-     
-     
-         /**
-         * Gets the IntegralTime.
-         *
-         * return the IntegralTime
-         */
-         @Bindable
-         public int getIntegralTime()
-         {
-            return integralTime;
-         }
-
-         /**
-         * Sets the IntegralTime.
-         *
-         * @param integralTime the IntegralTime
-         */
-         public void setIntegralTime(int integralTime)
-         {
-            this.integralTime = integralTime;
-            notifyPropertyChanged(BR.integralTime);
-         }
-     
-     
-         /**
-         * Gets the DerivativeTime.
-         *
-         * return the DerivativeTime
-         */
-         @Bindable
-         public int getDerivativeTime()
-         {
-            return derivativeTime;
-         }
-
-         /**
-         * Sets the DerivativeTime.
-         *
-         * @param derivativeTime the DerivativeTime
-         */
-         public void setDerivativeTime(int derivativeTime)
-         {
-            this.derivativeTime = derivativeTime;
-            notifyPropertyChanged(BR.derivativeTime);
-         }
-     
-     
-         /**
-         * Gets the SensorCorrectionAdjustment.
-         *
-         * return the SensorCorrectionAdjustment
-         */
-         @Bindable
-         public int getSensorCorrectionAdjustment()
-         {
-            return sensorCorrectionAdjustment;
-         }
-
-         /**
-         * Sets the SensorCorrectionAdjustment.
-         *
-         * @param sensorCorrectionAdjustment the SensorCorrectionAdjustment
-         */
-         public void setSensorCorrectionAdjustment(int sensorCorrectionAdjustment)
-         {
-            this.sensorCorrectionAdjustment = sensorCorrectionAdjustment;
-            notifyPropertyChanged(BR.sensorCorrectionAdjustment);
-         }
-     
-     
-         /**
-         * Gets the SensorMinValue.
-         *
-         * return the SensorMinValue
-         */
-         @Bindable
-         public int getSensorMinValue()
-         {
-            return sensorMinValue;
-         }
-
-         /**
-         * Sets the SensorMinValue.
-         *
-         * @param sensorMinValue the SensorMinValue
-         */
-         public void setSensorMinValue(int sensorMinValue)
-         {
-            this.sensorMinValue = sensorMinValue;
-            notifyPropertyChanged(BR.sensorMinValue);
-         }
-     
-     
-         /**
-         * Gets the SensorMaxValue.
-         *
-         * return the SensorMaxValue
-         */
-         @Bindable
-         public int getSensorMaxValue()
-         {
-            return sensorMaxValue;
-         }
-
-         /**
-         * Sets the SensorMaxValue.
-         *
-         * @param sensorMaxValue the SensorMaxValue
-         */
-         public void setSensorMaxValue(int sensorMaxValue)
-         {
-            this.sensorMaxValue = sensorMaxValue;
-            notifyPropertyChanged(BR.sensorMaxValue);
-         }
-     
-     
-         /**
-         * Gets the PointRampRateorSoftStartRamp.
-         *
-         * return the PointRampRateorSoftStartRamp
-         */
-         @Bindable
-         public int getPointRampRateorSoftStartRamp()
-         {
-            return pointRampRateorSoftStartRamp;
-         }
-
-         /**
-         * Sets the PointRampRateorSoftStartRamp.
-         *
-         * @param pointRampRateorSoftStartRamp the PointRampRateorSoftStartRamp
-         */
-         public void setPointRampRateorSoftStartRamp(int pointRampRateorSoftStartRamp)
-         {
-            this.pointRampRateorSoftStartRamp = pointRampRateorSoftStartRamp;
-            notifyPropertyChanged(BR.pointRampRateorSoftStartRamp);
-         }
-     
-     
-         /**
-         * Gets the PointControlOutputRate.
-         *
-         * return the PointControlOutputRate
-         */
-         @Bindable
-         public int getPointControlOutputRate()
-         {
-            return pointControlOutputRate;
-         }
-
-         /**
-         * Sets the PointControlOutputRate.
-         *
-         * @param pointControlOutputRate the PointControlOutputRate
-         */
-         public void setPointControlOutputRate(int pointControlOutputRate)
-         {
-            this.pointControlOutputRate = pointControlOutputRate;
-            notifyPropertyChanged(BR.pointControlOutputRate);
-         }
-     
-     
-         /**
-         * Gets the ControlOutputType.
-         *
-         * return the ControlOutputType
-         */
-         @Bindable
-         public int getControlOutputType()
-         {
-            return controlOutputType;
-         }
-
-         /**
-         * Sets the ControlOutputType.
-         *
-         * @param controlOutputType the ControlOutputType
-         */
-         public void setControlOutputType(int controlOutputType)
-         {
-            this.controlOutputType = controlOutputType;
-            notifyPropertyChanged(BR.controlOutputType);
-         }
-     
-     
-         /**
-         * Gets the SsrControlOutputType.
-         *
-         * return the SsrControlOutputType
-         */
-         @Bindable
-         public int getSsrControlOutputType()
-         {
-            return ssrControlOutputType;
-         }
-
-         /**
-         * Sets the SsrControlOutputType.
-         *
-         * @param ssrControlOutputType the SsrControlOutputType
-         */
-         public void setSsrControlOutputType(int ssrControlOutputType)
-         {
-            this.ssrControlOutputType = ssrControlOutputType;
-            notifyPropertyChanged(BR.ssrControlOutputType);
-         }
-     
-     
-         /**
-         * Gets the OutputOnOffHysteresisValue.
-         *
-         * return the OutputOnOffHysteresisValue
-         */
-         @Bindable
-         public int getOutputOnOffHysteresisValue()
-         {
-            return outputOnOffHysteresisValue;
-         }
-
-         /**
-         * Sets the OutputOnOffHysteresisValue.
-         *
-         * @param outputOnOffHysteresisValue the OutputOnOffHysteresisValue
-         */
-         public void setOutputOnOffHysteresisValue(int outputOnOffHysteresisValue)
-         {
-            this.outputOnOffHysteresisValue = outputOnOffHysteresisValue;
-            notifyPropertyChanged(BR.outputOnOffHysteresisValue);
-         }
-     
-     
-         /**
-         * Gets the ProcessVariableSamplingRate.
-         *
-         * return the ProcessVariableSamplingRate
-         */
-         @Bindable
-         public int getProcessVariableSamplingRate()
-         {
-            return processVariableSamplingRate;
-         }
-
-         /**
-         * Sets the ProcessVariableSamplingRate.
-         *
-         * @param processVariableSamplingRate the ProcessVariableSamplingRate
-         */
-         public void setProcessVariableSamplingRate(int processVariableSamplingRate)
-         {
-            this.processVariableSamplingRate = processVariableSamplingRate;
-            notifyPropertyChanged(BR.processVariableSamplingRate);
-         }
-     
-     
-         /**
-         * Gets the PvInputFilterFactorMode.
-         *
-         * return the PvInputFilterFactorMode
-         */
-         @Bindable
-         public int getPvInputFilterFactorMode()
-         {
-            return pvInputFilterFactorMode;
-         }
-
-         /**
-         * Sets the PvInputFilterFactorMode.
-         *
-         * @param pvInputFilterFactorMode the PvInputFilterFactorMode
-         */
-         public void setPvInputFilterFactorMode(int pvInputFilterFactorMode)
-         {
-            this.pvInputFilterFactorMode = pvInputFilterFactorMode;
-            notifyPropertyChanged(BR.pvInputFilterFactorMode);
-         }
-     
-     
-         /**
-         * Gets the HardwarePidControlType.
-         *
-         * return the HardwarePidControlType
-         */
-         @Bindable
-         public HardwarePidControlType getHardwarePidControlType()
-         {
-            return hardwarePidControlType;
-         }
-
-         /**
-         * Sets the HardwarePidControlType.
-         *
-         * @param hardwarePidControlType the HardwarePidControlType
-         */
-         public void setHardwarePidControlType(HardwarePidControlType hardwarePidControlType)
-         {
-            this.hardwarePidControlType = hardwarePidControlType;
-            notifyPropertyChanged(BR.hardwarePidControlType);
-         }
-     
-     
-         /**
-         * Gets the HardwareVersion.
-         *
-         * return the HardwareVersion
-         */
-         @Bindable
-         public HardwareVersion getHardwareVersion()
-         {
-            return hardwareVersion;
-         }
-
-         /**
-         * Sets the HardwareVersion.
-         *
-         * @param hardwareVersion the HardwareVersion
-         */
-         public void setHardwareVersion(HardwareVersion hardwareVersion)
-         {
-            this.hardwareVersion = hardwareVersion;
-            notifyPropertyChanged(BR.hardwareVersion);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControlType.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControlType.java
deleted file mode 100644
index d29f07c56..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControlType.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "HARDWARE_PID_CONTROL_TYPES", database = TangoDB.class, cachingEnabled = true)
-public class HardwarePidControlType extends HardwarePidControlTypeBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControlTypeBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControlTypeBase.java
deleted file mode 100644
index f560be28a..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControlTypeBase.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class HardwarePidControlTypeBase extends Entity 
-    {
-    
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareVersion.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareVersion.java
deleted file mode 100644
index b6b0f7d8d..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareVersion.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "HARDWARE_VERSIONS", database = TangoDB.class, cachingEnabled = true)
-public class HardwareVersion extends HardwareVersionBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareVersionBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareVersionBase.java
deleted file mode 100644
index 0b56818ff..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareVersionBase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class HardwareVersionBase extends Entity 
-    {
-    
-            @Column(name = "VERSION")
-            private double version;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-
-     
-         /**
-         * Gets the Version.
-         *
-         * return the Version
-         */
-         @Bindable
-         public double getVersion()
-         {
-            return version;
-         }
-
-         /**
-         * Sets the Version.
-         *
-         * @param version the Version
-         */
-         public void setVersion(double version)
-         {
-            this.version = version;
-            notifyPropertyChanged(BR.version);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinder.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinder.java
deleted file mode 100644
index 283a13570..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinder.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "HARDWARE_WINDERS", database = TangoDB.class, cachingEnabled = true)
-public class HardwareWinder extends HardwareWinderBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinderBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinderBase.java
deleted file mode 100644
index 5f951377b..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinderBase.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class HardwareWinderBase extends Entity 
-    {
-    
-            @Column(name = "MILLIMETER_PER_ROTATION")
-            private int millimeterPerRotation;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "HARDWARE_VERSION_GUID", foreignKeyColumnName = "GUID")})
-            private HardwareVersion hardwareVersion;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "HARDWARE_WINDER_TYPE_GUID", foreignKeyColumnName = "GUID")})
-            private HardwareWinderType hardwareWinderType;
-
-    
-
-     
-         /**
-         * Gets the MillimeterPerRotation.
-         *
-         * return the MillimeterPerRotation
-         */
-         @Bindable
-         public int getMillimeterPerRotation()
-         {
-            return millimeterPerRotation;
-         }
-
-         /**
-         * Sets the MillimeterPerRotation.
-         *
-         * @param millimeterPerRotation the MillimeterPerRotation
-         */
-         public void setMillimeterPerRotation(int millimeterPerRotation)
-         {
-            this.millimeterPerRotation = millimeterPerRotation;
-            notifyPropertyChanged(BR.millimeterPerRotation);
-         }
-     
-     
-         /**
-         * Gets the HardwareVersion.
-         *
-         * return the HardwareVersion
-         */
-         @Bindable
-         public HardwareVersion getHardwareVersion()
-         {
-            return hardwareVersion;
-         }
-
-         /**
-         * Sets the HardwareVersion.
-         *
-         * @param hardwareVersion the HardwareVersion
-         */
-         public void setHardwareVersion(HardwareVersion hardwareVersion)
-         {
-            this.hardwareVersion = hardwareVersion;
-            notifyPropertyChanged(BR.hardwareVersion);
-         }
-     
-     
-         /**
-         * Gets the HardwareWinderType.
-         *
-         * return the HardwareWinderType
-         */
-         @Bindable
-         public HardwareWinderType getHardwareWinderType()
-         {
-            return hardwareWinderType;
-         }
-
-         /**
-         * Sets the HardwareWinderType.
-         *
-         * @param hardwareWinderType the HardwareWinderType
-         */
-         public void setHardwareWinderType(HardwareWinderType hardwareWinderType)
-         {
-            this.hardwareWinderType = hardwareWinderType;
-            notifyPropertyChanged(BR.hardwareWinderType);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinderType.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinderType.java
deleted file mode 100644
index 49c3eeaff..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinderType.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "HARDWARE_WINDER_TYPES", database = TangoDB.class, cachingEnabled = true)
-public class HardwareWinderType extends HardwareWinderTypeBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinderTypeBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinderTypeBase.java
deleted file mode 100644
index 09d2d5ffd..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinderTypeBase.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class HardwareWinderTypeBase extends Entity 
-    {
-    
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPack.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPack.java
deleted file mode 100644
index d12bcd2d0..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPack.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "IDS_PACKS", database = TangoDB.class, cachingEnabled = true)
-public class IdsPack extends IdsPackBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPackBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPackBase.java
deleted file mode 100644
index 4552e82c0..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPackBase.java
+++ /dev/null
@@ -1,239 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class IdsPackBase extends Entity 
-    {
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "PACK_INDEX")
-            private int packIndex;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "CARTRIDGE_TYPE_GUID", foreignKeyColumnName = "GUID")})
-            private CartridgeType cartridgeType;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "CONFIGURATION_GUID", foreignKeyColumnName = "GUID")})
-            private Configuration configuration;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "DISPENSER_TYPE_GUID", foreignKeyColumnName = "GUID")})
-            private DispenserType dispenserType;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "IDS_PACK_FORMULA_GUID", foreignKeyColumnName = "GUID")})
-            private IdsPackFormula idsPackFormula;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "LIQUID_TYPE_GUID", foreignKeyColumnName = "GUID")})
-            private LiquidType liquidType;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "MID_TANK_TYPE_GUID", foreignKeyColumnName = "GUID")})
-            private MidTankType midTankType;
-
-    
-
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the PackIndex.
-         *
-         * return the PackIndex
-         */
-         @Bindable
-         public int getPackIndex()
-         {
-            return packIndex;
-         }
-
-         /**
-         * Sets the PackIndex.
-         *
-         * @param packIndex the PackIndex
-         */
-         public void setPackIndex(int packIndex)
-         {
-            this.packIndex = packIndex;
-            notifyPropertyChanged(BR.packIndex);
-         }
-     
-     
-         /**
-         * Gets the CartridgeType.
-         *
-         * return the CartridgeType
-         */
-         @Bindable
-         public CartridgeType getCartridgeType()
-         {
-            return cartridgeType;
-         }
-
-         /**
-         * Sets the CartridgeType.
-         *
-         * @param cartridgeType the CartridgeType
-         */
-         public void setCartridgeType(CartridgeType cartridgeType)
-         {
-            this.cartridgeType = cartridgeType;
-            notifyPropertyChanged(BR.cartridgeType);
-         }
-     
-     
-         /**
-         * Gets the Configuration.
-         *
-         * return the Configuration
-         */
-         @Bindable
-         public Configuration getConfiguration()
-         {
-            return configuration;
-         }
-
-         /**
-         * Sets the Configuration.
-         *
-         * @param configuration the Configuration
-         */
-         public void setConfiguration(Configuration configuration)
-         {
-            this.configuration = configuration;
-            notifyPropertyChanged(BR.configuration);
-         }
-     
-     
-         /**
-         * Gets the DispenserType.
-         *
-         * return the DispenserType
-         */
-         @Bindable
-         public DispenserType getDispenserType()
-         {
-            return dispenserType;
-         }
-
-         /**
-         * Sets the DispenserType.
-         *
-         * @param dispenserType the DispenserType
-         */
-         public void setDispenserType(DispenserType dispenserType)
-         {
-            this.dispenserType = dispenserType;
-            notifyPropertyChanged(BR.dispenserType);
-         }
-     
-     
-         /**
-         * Gets the IdsPackFormula.
-         *
-         * return the IdsPackFormula
-         */
-         @Bindable
-         public IdsPackFormula getIdsPackFormula()
-         {
-            return idsPackFormula;
-         }
-
-         /**
-         * Sets the IdsPackFormula.
-         *
-         * @param idsPackFormula the IdsPackFormula
-         */
-         public void setIdsPackFormula(IdsPackFormula idsPackFormula)
-         {
-            this.idsPackFormula = idsPackFormula;
-            notifyPropertyChanged(BR.idsPackFormula);
-         }
-     
-     
-         /**
-         * Gets the LiquidType.
-         *
-         * return the LiquidType
-         */
-         @Bindable
-         public LiquidType getLiquidType()
-         {
-            return liquidType;
-         }
-
-         /**
-         * Sets the LiquidType.
-         *
-         * @param liquidType the LiquidType
-         */
-         public void setLiquidType(LiquidType liquidType)
-         {
-            this.liquidType = liquidType;
-            notifyPropertyChanged(BR.liquidType);
-         }
-     
-     
-         /**
-         * Gets the MidTankType.
-         *
-         * return the MidTankType
-         */
-         @Bindable
-         public MidTankType getMidTankType()
-         {
-            return midTankType;
-         }
-
-         /**
-         * Sets the MidTankType.
-         *
-         * @param midTankType the MidTankType
-         */
-         public void setMidTankType(MidTankType midTankType)
-         {
-            this.midTankType = midTankType;
-            notifyPropertyChanged(BR.midTankType);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPackFormula.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPackFormula.java
deleted file mode 100644
index 5720b4764..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPackFormula.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "IDS_PACK_FORMULAS", database = TangoDB.class, cachingEnabled = true)
-public class IdsPackFormula extends IdsPackFormulaBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPackFormulaBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPackFormulaBase.java
deleted file mode 100644
index f651ac7cd..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPackFormulaBase.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class IdsPackFormulaBase extends Entity 
-    {
-    
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-    
-            @Column(name = "AUTO_CALCULATED")
-            private boolean autoCalculated;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-     
-         /**
-         * Gets the AutoCalculated.
-         *
-         * return the AutoCalculated
-         */
-         @Bindable
-         public boolean isAutoCalculated()
-         {
-            return autoCalculated;
-         }
-
-         /**
-         * Sets the AutoCalculated.
-         *
-         * @param autoCalculated the AutoCalculated
-         */
-         public void setAutoCalculated(boolean autoCalculated)
-         {
-            this.autoCalculated = autoCalculated;
-            notifyPropertyChanged(BR.autoCalculated);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Job.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Job.java
deleted file mode 100644
index 10df0c9c1..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Job.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "JOBS", database = TangoDB.class, cachingEnabled = true)
-public class Job extends JobBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/JobBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/JobBase.java
deleted file mode 100644
index b2c001db3..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/JobBase.java
+++ /dev/null
@@ -1,491 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class JobBase extends Entity 
-    {
-    
-            @Column(name = "CREATION_DATE")
-            private DateTime creationDate;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-    
-            @Column(name = "INTER_SEGMENT_LENGTH")
-            private double interSegmentLength;
-
-    
-    
-            @Column(name = "ENABLE_INTER_SEGMENT")
-            private boolean enableInterSegment;
-
-    
-    
-            @Column(name = "ENABLE_LUBRICATION")
-            private boolean enableLubrication;
-
-    
-    
-            @Column(name = "JOB_INDEX")
-            private int jobIndex;
-
-    
-    
-            @Column(name = "ESTIMATED_DURATION_MILI")
-            private int estimatedDurationMili;
-
-    
-    
-            @Column(name = "HAS_EMBROIDERY_FILE")
-            private boolean hasEmbroideryFile;
-
-    
-    
-            @Column(name = "EMBROIDERY_FILE_DATA")
-            private byte[] embroideryFileData;
-
-    
-    
-            @Column(name = "EMBROIDERY_FILE_NAME")
-            private String embroideryFileName;
-
-    
-    
-            @Column(name = "EMBROIDERY_JPEG")
-            private byte[] embroideryJpeg;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "MACHINE_GUID", foreignKeyColumnName = "GUID")})
-            private Machine machine;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "RML_GUID", foreignKeyColumnName = "GUID")})
-            private Rml rml;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "SPOOL_TYPE_GUID", foreignKeyColumnName = "GUID")})
-            private SpoolType spoolType;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "USER_GUID", foreignKeyColumnName = "GUID")})
-            private User user;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "WINDING_METHOD_GUID", foreignKeyColumnName = "GUID")})
-            private WindingMethod windingMethod;
-
-    
-
-     
-         /**
-         * Gets the CreationDate.
-         *
-         * return the CreationDate
-         */
-         @Bindable
-         public DateTime getCreationDate()
-         {
-            return creationDate;
-         }
-
-         /**
-         * Sets the CreationDate.
-         *
-         * @param creationDate the CreationDate
-         */
-         public void setCreationDate(DateTime creationDate)
-         {
-            this.creationDate = creationDate;
-            notifyPropertyChanged(BR.creationDate);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-     
-         /**
-         * Gets the InterSegmentLength.
-         *
-         * return the InterSegmentLength
-         */
-         @Bindable
-         public double getInterSegmentLength()
-         {
-            return interSegmentLength;
-         }
-
-         /**
-         * Sets the InterSegmentLength.
-         *
-         * @param interSegmentLength the InterSegmentLength
-         */
-         public void setInterSegmentLength(double interSegmentLength)
-         {
-            this.interSegmentLength = interSegmentLength;
-            notifyPropertyChanged(BR.interSegmentLength);
-         }
-     
-     
-         /**
-         * Gets the EnableInterSegment.
-         *
-         * return the EnableInterSegment
-         */
-         @Bindable
-         public boolean isEnableInterSegment()
-         {
-            return enableInterSegment;
-         }
-
-         /**
-         * Sets the EnableInterSegment.
-         *
-         * @param enableInterSegment the EnableInterSegment
-         */
-         public void setEnableInterSegment(boolean enableInterSegment)
-         {
-            this.enableInterSegment = enableInterSegment;
-            notifyPropertyChanged(BR.enableInterSegment);
-         }
-     
-     
-         /**
-         * Gets the EnableLubrication.
-         *
-         * return the EnableLubrication
-         */
-         @Bindable
-         public boolean isEnableLubrication()
-         {
-            return enableLubrication;
-         }
-
-         /**
-         * Sets the EnableLubrication.
-         *
-         * @param enableLubrication the EnableLubrication
-         */
-         public void setEnableLubrication(boolean enableLubrication)
-         {
-            this.enableLubrication = enableLubrication;
-            notifyPropertyChanged(BR.enableLubrication);
-         }
-     
-     
-         /**
-         * Gets the JobIndex.
-         *
-         * return the JobIndex
-         */
-         @Bindable
-         public int getJobIndex()
-         {
-            return jobIndex;
-         }
-
-         /**
-         * Sets the JobIndex.
-         *
-         * @param jobIndex the JobIndex
-         */
-         public void setJobIndex(int jobIndex)
-         {
-            this.jobIndex = jobIndex;
-            notifyPropertyChanged(BR.jobIndex);
-         }
-     
-     
-         /**
-         * Gets the EstimatedDurationMili.
-         *
-         * return the EstimatedDurationMili
-         */
-         @Bindable
-         public int getEstimatedDurationMili()
-         {
-            return estimatedDurationMili;
-         }
-
-         /**
-         * Sets the EstimatedDurationMili.
-         *
-         * @param estimatedDurationMili the EstimatedDurationMili
-         */
-         public void setEstimatedDurationMili(int estimatedDurationMili)
-         {
-            this.estimatedDurationMili = estimatedDurationMili;
-            notifyPropertyChanged(BR.estimatedDurationMili);
-         }
-     
-     
-         /**
-         * Gets the HasEmbroideryFile.
-         *
-         * return the HasEmbroideryFile
-         */
-         @Bindable
-         public boolean isHasEmbroideryFile()
-         {
-            return hasEmbroideryFile;
-         }
-
-         /**
-         * Sets the HasEmbroideryFile.
-         *
-         * @param hasEmbroideryFile the HasEmbroideryFile
-         */
-         public void setHasEmbroideryFile(boolean hasEmbroideryFile)
-         {
-            this.hasEmbroideryFile = hasEmbroideryFile;
-            notifyPropertyChanged(BR.hasEmbroideryFile);
-         }
-     
-     
-         /**
-         * Gets the EmbroideryFileData.
-         *
-         * return the EmbroideryFileData
-         */
-         @Bindable
-         public byte[] getEmbroideryFileData()
-         {
-            return embroideryFileData;
-         }
-
-         /**
-         * Sets the EmbroideryFileData.
-         *
-         * @param embroideryFileData the EmbroideryFileData
-         */
-         public void setEmbroideryFileData(byte[] embroideryFileData)
-         {
-            this.embroideryFileData = embroideryFileData;
-            notifyPropertyChanged(BR.embroideryFileData);
-         }
-     
-     
-         /**
-         * Gets the EmbroideryFileName.
-         *
-         * return the EmbroideryFileName
-         */
-         @Bindable
-         public String getEmbroideryFileName()
-         {
-            return embroideryFileName;
-         }
-
-         /**
-         * Sets the EmbroideryFileName.
-         *
-         * @param embroideryFileName the EmbroideryFileName
-         */
-         public void setEmbroideryFileName(String embroideryFileName)
-         {
-            this.embroideryFileName = embroideryFileName;
-            notifyPropertyChanged(BR.embroideryFileName);
-         }
-     
-     
-         /**
-         * Gets the EmbroideryJpeg.
-         *
-         * return the EmbroideryJpeg
-         */
-         @Bindable
-         public byte[] getEmbroideryJpeg()
-         {
-            return embroideryJpeg;
-         }
-
-         /**
-         * Sets the EmbroideryJpeg.
-         *
-         * @param embroideryJpeg the EmbroideryJpeg
-         */
-         public void setEmbroideryJpeg(byte[] embroideryJpeg)
-         {
-            this.embroideryJpeg = embroideryJpeg;
-            notifyPropertyChanged(BR.embroideryJpeg);
-         }
-     
-     
-         /**
-         * Gets the Machine.
-         *
-         * return the Machine
-         */
-         @Bindable
-         public Machine getMachine()
-         {
-            return machine;
-         }
-
-         /**
-         * Sets the Machine.
-         *
-         * @param machine the Machine
-         */
-         public void setMachine(Machine machine)
-         {
-            this.machine = machine;
-            notifyPropertyChanged(BR.machine);
-         }
-     
-     
-         /**
-         * Gets the Rml.
-         *
-         * return the Rml
-         */
-         @Bindable
-         public Rml getRml()
-         {
-            return rml;
-         }
-
-         /**
-         * Sets the Rml.
-         *
-         * @param rml the Rml
-         */
-         public void setRml(Rml rml)
-         {
-            this.rml = rml;
-            notifyPropertyChanged(BR.rml);
-         }
-     
-     
-         /**
-         * Gets the SpoolType.
-         *
-         * return the SpoolType
-         */
-         @Bindable
-         public SpoolType getSpoolType()
-         {
-            return spoolType;
-         }
-
-         /**
-         * Sets the SpoolType.
-         *
-         * @param spoolType the SpoolType
-         */
-         public void setSpoolType(SpoolType spoolType)
-         {
-            this.spoolType = spoolType;
-            notifyPropertyChanged(BR.spoolType);
-         }
-     
-     
-         /**
-         * Gets the User.
-         *
-         * return the User
-         */
-         @Bindable
-         public User getUser()
-         {
-            return user;
-         }
-
-         /**
-         * Sets the User.
-         *
-         * @param user the User
-         */
-         public void setUser(User user)
-         {
-            this.user = user;
-            notifyPropertyChanged(BR.user);
-         }
-     
-     
-         /**
-         * Gets the WindingMethod.
-         *
-         * return the WindingMethod
-         */
-         @Bindable
-         public WindingMethod getWindingMethod()
-         {
-            return windingMethod;
-         }
-
-         /**
-         * Sets the WindingMethod.
-         *
-         * @param windingMethod the WindingMethod
-         */
-         public void setWindingMethod(WindingMethod windingMethod)
-         {
-            this.windingMethod = windingMethod;
-            notifyPropertyChanged(BR.windingMethod);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/JobRun.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/JobRun.java
deleted file mode 100644
index 5e2d1c56c..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/JobRun.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "JOB_RUNS", database = TangoDB.class, cachingEnabled = true)
-public class JobRun extends JobRunBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/JobRunBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/JobRunBase.java
deleted file mode 100644
index c97f84f8f..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/JobRunBase.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class JobRunBase extends Entity 
-    {
-    
-            @Column(name = "START_DATE")
-            private DateTime startDate;
-
-    
-    
-            @Column(name = "END_DATE")
-            private DateTime endDate;
-
-    
-    
-            @Column(name = "SUCCESSFUL")
-            private boolean successful;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "JOB_GUID", foreignKeyColumnName = "GUID")})
-            private Job job;
-
-    
-
-     
-         /**
-         * Gets the StartDate.
-         *
-         * return the StartDate
-         */
-         @Bindable
-         public DateTime getStartDate()
-         {
-            return startDate;
-         }
-
-         /**
-         * Sets the StartDate.
-         *
-         * @param startDate the StartDate
-         */
-         public void setStartDate(DateTime startDate)
-         {
-            this.startDate = startDate;
-            notifyPropertyChanged(BR.startDate);
-         }
-     
-     
-         /**
-         * Gets the EndDate.
-         *
-         * return the EndDate
-         */
-         @Bindable
-         public DateTime getEndDate()
-         {
-            return endDate;
-         }
-
-         /**
-         * Sets the EndDate.
-         *
-         * @param endDate the EndDate
-         */
-         public void setEndDate(DateTime endDate)
-         {
-            this.endDate = endDate;
-            notifyPropertyChanged(BR.endDate);
-         }
-     
-     
-         /**
-         * Gets the Successful.
-         *
-         * return the Successful
-         */
-         @Bindable
-         public boolean isSuccessful()
-         {
-            return successful;
-         }
-
-         /**
-         * Sets the Successful.
-         *
-         * @param successful the Successful
-         */
-         public void setSuccessful(boolean successful)
-         {
-            this.successful = successful;
-            notifyPropertyChanged(BR.successful);
-         }
-     
-     
-         /**
-         * Gets the Job.
-         *
-         * return the Job
-         */
-         @Bindable
-         public Job getJob()
-         {
-            return job;
-         }
-
-         /**
-         * Sets the Job.
-         *
-         * @param job the Job
-         */
-         public void setJob(Job job)
-         {
-            this.job = job;
-            notifyPropertyChanged(BR.job);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LinearMassDensityUnit.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LinearMassDensityUnit.java
deleted file mode 100644
index 475d8beac..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LinearMassDensityUnit.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "LINEAR_MASS_DENSITY_UNITS", database = TangoDB.class, cachingEnabled = true)
-public class LinearMassDensityUnit extends LinearMassDensityUnitBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LinearMassDensityUnitBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LinearMassDensityUnitBase.java
deleted file mode 100644
index 8179be400..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LinearMassDensityUnitBase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class LinearMassDensityUnitBase extends Entity 
-    {
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "CODE")
-            private int code;
-
-    
-
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidType.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidType.java
deleted file mode 100644
index fec3c8e78..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidType.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "LIQUID_TYPES", database = TangoDB.class, cachingEnabled = true)
-public class LiquidType extends LiquidTypeBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypeBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypeBase.java
deleted file mode 100644
index 0ab2ec5f3..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypeBase.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class LiquidTypeBase extends Entity 
-    {
-    
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "VERSION")
-            private double version;
-
-    
-    
-            @Column(name = "COLOR")
-            private int color;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Version.
-         *
-         * return the Version
-         */
-         @Bindable
-         public double getVersion()
-         {
-            return version;
-         }
-
-         /**
-         * Sets the Version.
-         *
-         * @param version the Version
-         */
-         public void setVersion(double version)
-         {
-            this.version = version;
-            notifyPropertyChanged(BR.version);
-         }
-     
-     
-         /**
-         * Gets the Color.
-         *
-         * return the Color
-         */
-         @Bindable
-         public int getColor()
-         {
-            return color;
-         }
-
-         /**
-         * Sets the Color.
-         *
-         * @param color the Color
-         */
-         public void setColor(int color)
-         {
-            this.color = color;
-            notifyPropertyChanged(BR.color);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypesRml.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypesRml.java
deleted file mode 100644
index 65ea0b02e..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypesRml.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "LIQUID_TYPES_RMLS", database = TangoDB.class, cachingEnabled = true)
-public class LiquidTypesRml extends LiquidTypesRmlBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypesRmlBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypesRmlBase.java
deleted file mode 100644
index 531537360..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypesRmlBase.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class LiquidTypesRmlBase extends Entity 
-    {
-    
-            @Column(name = "MAX_NL_PER_CM")
-            private double maxNlPerCm;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "LIQUID_TYPE_GUID", foreignKeyColumnName = "GUID")})
-            private LiquidType liquidType;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "RML_GUID", foreignKeyColumnName = "GUID")})
-            private Rml rml;
-
-    
-
-     
-         /**
-         * Gets the MaxNlPerCm.
-         *
-         * return the MaxNlPerCm
-         */
-         @Bindable
-         public double getMaxNlPerCm()
-         {
-            return maxNlPerCm;
-         }
-
-         /**
-         * Sets the MaxNlPerCm.
-         *
-         * @param maxNlPerCm the MaxNlPerCm
-         */
-         public void setMaxNlPerCm(double maxNlPerCm)
-         {
-            this.maxNlPerCm = maxNlPerCm;
-            notifyPropertyChanged(BR.maxNlPerCm);
-         }
-     
-     
-         /**
-         * Gets the LiquidType.
-         *
-         * return the LiquidType
-         */
-         @Bindable
-         public LiquidType getLiquidType()
-         {
-            return liquidType;
-         }
-
-         /**
-         * Sets the LiquidType.
-         *
-         * @param liquidType the LiquidType
-         */
-         public void setLiquidType(LiquidType liquidType)
-         {
-            this.liquidType = liquidType;
-            notifyPropertyChanged(BR.liquidType);
-         }
-     
-     
-         /**
-         * Gets the Rml.
-         *
-         * return the Rml
-         */
-         @Bindable
-         public Rml getRml()
-         {
-            return rml;
-         }
-
-         /**
-         * Sets the Rml.
-         *
-         * @param rml the Rml
-         */
-         public void setRml(Rml rml)
-         {
-            this.rml = rml;
-            notifyPropertyChanged(BR.rml);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Machine.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Machine.java
deleted file mode 100644
index 162416be5..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Machine.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "MACHINES", database = TangoDB.class, cachingEnabled = true)
-public class Machine extends MachineBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineBase.java
deleted file mode 100644
index 05678fbbb..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineBase.java
+++ /dev/null
@@ -1,239 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class MachineBase extends Entity 
-    {
-    
-            @Column(name = "SERIAL_NUMBER")
-            private String serialNumber;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "PRODUCTION_DATE")
-            private DateTime productionDate;
-
-    
-    
-            @Column(name = "EXTERNAL_BRIDGE_PASSWORD")
-            private String externalBridgePassword;
-
-    
-    
-            @Column(name = "SYNCHED")
-            private boolean synched;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "CONFIGURATION_GUID", foreignKeyColumnName = "GUID")})
-            private Configuration configuration;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "MACHINE_VERSION_GUID", foreignKeyColumnName = "GUID")})
-            private MachineVersion machineVersion;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "ORGANIZATION_GUID", foreignKeyColumnName = "GUID")})
-            private Organization organization;
-
-    
-
-     
-         /**
-         * Gets the SerialNumber.
-         *
-         * return the SerialNumber
-         */
-         @Bindable
-         public String getSerialNumber()
-         {
-            return serialNumber;
-         }
-
-         /**
-         * Sets the SerialNumber.
-         *
-         * @param serialNumber the SerialNumber
-         */
-         public void setSerialNumber(String serialNumber)
-         {
-            this.serialNumber = serialNumber;
-            notifyPropertyChanged(BR.serialNumber);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the ProductionDate.
-         *
-         * return the ProductionDate
-         */
-         @Bindable
-         public DateTime getProductionDate()
-         {
-            return productionDate;
-         }
-
-         /**
-         * Sets the ProductionDate.
-         *
-         * @param productionDate the ProductionDate
-         */
-         public void setProductionDate(DateTime productionDate)
-         {
-            this.productionDate = productionDate;
-            notifyPropertyChanged(BR.productionDate);
-         }
-     
-     
-         /**
-         * Gets the ExternalBridgePassword.
-         *
-         * return the ExternalBridgePassword
-         */
-         @Bindable
-         public String getExternalBridgePassword()
-         {
-            return externalBridgePassword;
-         }
-
-         /**
-         * Sets the ExternalBridgePassword.
-         *
-         * @param externalBridgePassword the ExternalBridgePassword
-         */
-         public void setExternalBridgePassword(String externalBridgePassword)
-         {
-            this.externalBridgePassword = externalBridgePassword;
-            notifyPropertyChanged(BR.externalBridgePassword);
-         }
-     
-     
-         /**
-         * Gets the Synched.
-         *
-         * return the Synched
-         */
-         @Bindable
-         public boolean isSynched()
-         {
-            return synched;
-         }
-
-         /**
-         * Sets the Synched.
-         *
-         * @param synched the Synched
-         */
-         public void setSynched(boolean synched)
-         {
-            this.synched = synched;
-            notifyPropertyChanged(BR.synched);
-         }
-     
-     
-         /**
-         * Gets the Configuration.
-         *
-         * return the Configuration
-         */
-         @Bindable
-         public Configuration getConfiguration()
-         {
-            return configuration;
-         }
-
-         /**
-         * Sets the Configuration.
-         *
-         * @param configuration the Configuration
-         */
-         public void setConfiguration(Configuration configuration)
-         {
-            this.configuration = configuration;
-            notifyPropertyChanged(BR.configuration);
-         }
-     
-     
-         /**
-         * Gets the MachineVersion.
-         *
-         * return the MachineVersion
-         */
-         @Bindable
-         public MachineVersion getMachineVersion()
-         {
-            return machineVersion;
-         }
-
-         /**
-         * Sets the MachineVersion.
-         *
-         * @param machineVersion the MachineVersion
-         */
-         public void setMachineVersion(MachineVersion machineVersion)
-         {
-            this.machineVersion = machineVersion;
-            notifyPropertyChanged(BR.machineVersion);
-         }
-     
-     
-         /**
-         * Gets the Organization.
-         *
-         * return the Organization
-         */
-         @Bindable
-         public Organization getOrganization()
-         {
-            return organization;
-         }
-
-         /**
-         * Sets the Organization.
-         *
-         * @param organization the Organization
-         */
-         public void setOrganization(Organization organization)
-         {
-            this.organization = organization;
-            notifyPropertyChanged(BR.organization);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineStudioVersion.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineStudioVersion.java
deleted file mode 100644
index 903a3e5ff..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineStudioVersion.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "MACHINE_STUDIO_VERSIONS", database = TangoDB.class, cachingEnabled = true)
-public class MachineStudioVersion extends MachineStudioVersionBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineStudioVersionBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineStudioVersionBase.java
deleted file mode 100644
index 206f597a6..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineStudioVersionBase.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class MachineStudioVersionBase extends Entity 
-    {
-    
-            @Column(name = "VERSION")
-            private String version;
-
-    
-    
-            @Column(name = "FTP_FILE_PATH")
-            private String ftpFilePath;
-
-    
-    
-            @Column(name = "COMMENTS")
-            private String comments;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "USER_GUID", foreignKeyColumnName = "GUID")})
-            private User user;
-
-    
-
-     
-         /**
-         * Gets the Version.
-         *
-         * return the Version
-         */
-         @Bindable
-         public String getVersion()
-         {
-            return version;
-         }
-
-         /**
-         * Sets the Version.
-         *
-         * @param version the Version
-         */
-         public void setVersion(String version)
-         {
-            this.version = version;
-            notifyPropertyChanged(BR.version);
-         }
-     
-     
-         /**
-         * Gets the FtpFilePath.
-         *
-         * return the FtpFilePath
-         */
-         @Bindable
-         public String getFtpFilePath()
-         {
-            return ftpFilePath;
-         }
-
-         /**
-         * Sets the FtpFilePath.
-         *
-         * @param ftpFilePath the FtpFilePath
-         */
-         public void setFtpFilePath(String ftpFilePath)
-         {
-            this.ftpFilePath = ftpFilePath;
-            notifyPropertyChanged(BR.ftpFilePath);
-         }
-     
-     
-         /**
-         * Gets the Comments.
-         *
-         * return the Comments
-         */
-         @Bindable
-         public String getComments()
-         {
-            return comments;
-         }
-
-         /**
-         * Sets the Comments.
-         *
-         * @param comments the Comments
-         */
-         public void setComments(String comments)
-         {
-            this.comments = comments;
-            notifyPropertyChanged(BR.comments);
-         }
-     
-     
-         /**
-         * Gets the User.
-         *
-         * return the User
-         */
-         @Bindable
-         public User getUser()
-         {
-            return user;
-         }
-
-         /**
-         * Sets the User.
-         *
-         * @param user the User
-         */
-         public void setUser(User user)
-         {
-            this.user = user;
-            notifyPropertyChanged(BR.user);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineVersion.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineVersion.java
deleted file mode 100644
index 77d866ec3..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineVersion.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "MACHINE_VERSIONS", database = TangoDB.class, cachingEnabled = true)
-public class MachineVersion extends MachineVersionBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineVersionBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineVersionBase.java
deleted file mode 100644
index bc0da03e5..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineVersionBase.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class MachineVersionBase extends Entity 
-    {
-    
-            @Column(name = "VERSION")
-            private double version;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "CONFIGURATION_GUID", foreignKeyColumnName = "GUID")})
-            private Configuration configuration;
-
-    
-
-     
-         /**
-         * Gets the Version.
-         *
-         * return the Version
-         */
-         @Bindable
-         public double getVersion()
-         {
-            return version;
-         }
-
-         /**
-         * Sets the Version.
-         *
-         * @param version the Version
-         */
-         public void setVersion(double version)
-         {
-            this.version = version;
-            notifyPropertyChanged(BR.version);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Configuration.
-         *
-         * return the Configuration
-         */
-         @Bindable
-         public Configuration getConfiguration()
-         {
-            return configuration;
-         }
-
-         /**
-         * Sets the Configuration.
-         *
-         * @param configuration the Configuration
-         */
-         public void setConfiguration(Configuration configuration)
-         {
-            this.configuration = configuration;
-            notifyPropertyChanged(BR.configuration);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesConfiguration.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesConfiguration.java
deleted file mode 100644
index c43629185..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesConfiguration.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "MACHINES_CONFIGURATIONS", database = TangoDB.class, cachingEnabled = true)
-public class MachinesConfiguration extends MachinesConfigurationBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesConfigurationBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesConfigurationBase.java
deleted file mode 100644
index 3f2fab5da..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesConfigurationBase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class MachinesConfigurationBase extends Entity 
-    {
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "CONFIGURATION_GUID", foreignKeyColumnName = "GUID")})
-            private Configuration configuration;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "MACHINE_GUID", foreignKeyColumnName = "GUID")})
-            private Machine machine;
-
-    
-
-     
-         /**
-         * Gets the Configuration.
-         *
-         * return the Configuration
-         */
-         @Bindable
-         public Configuration getConfiguration()
-         {
-            return configuration;
-         }
-
-         /**
-         * Sets the Configuration.
-         *
-         * @param configuration the Configuration
-         */
-         public void setConfiguration(Configuration configuration)
-         {
-            this.configuration = configuration;
-            notifyPropertyChanged(BR.configuration);
-         }
-     
-     
-         /**
-         * Gets the Machine.
-         *
-         * return the Machine
-         */
-         @Bindable
-         public Machine getMachine()
-         {
-            return machine;
-         }
-
-         /**
-         * Sets the Machine.
-         *
-         * @param machine the Machine
-         */
-         public void setMachine(Machine machine)
-         {
-            this.machine = machine;
-            notifyPropertyChanged(BR.machine);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesEvent.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesEvent.java
deleted file mode 100644
index dbb64b499..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesEvent.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "MACHINES_EVENTS", database = TangoDB.class, cachingEnabled = true)
-public class MachinesEvent extends MachinesEventBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesEventBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesEventBase.java
deleted file mode 100644
index e35e293db..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesEventBase.java
+++ /dev/null
@@ -1,183 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class MachinesEventBase extends Entity 
-    {
-    
-            @Column(name = "HOST_NAME")
-            private String hostName;
-
-    
-    
-            @Column(name = "DATE_TIME")
-            private DateTime dateTime;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "EVENT_TYPE_GUID", foreignKeyColumnName = "GUID")})
-            private EventType eventType;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "MACHINE_GUID", foreignKeyColumnName = "GUID")})
-            private Machine machine;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "USER_GUID", foreignKeyColumnName = "GUID")})
-            private User user;
-
-    
-
-     
-         /**
-         * Gets the HostName.
-         *
-         * return the HostName
-         */
-         @Bindable
-         public String getHostName()
-         {
-            return hostName;
-         }
-
-         /**
-         * Sets the HostName.
-         *
-         * @param hostName the HostName
-         */
-         public void setHostName(String hostName)
-         {
-            this.hostName = hostName;
-            notifyPropertyChanged(BR.hostName);
-         }
-     
-     
-         /**
-         * Gets the DateTime.
-         *
-         * return the DateTime
-         */
-         @Bindable
-         public DateTime getDateTime()
-         {
-            return dateTime;
-         }
-
-         /**
-         * Sets the DateTime.
-         *
-         * @param dateTime the DateTime
-         */
-         public void setDateTime(DateTime dateTime)
-         {
-            this.dateTime = dateTime;
-            notifyPropertyChanged(BR.dateTime);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-     
-         /**
-         * Gets the EventType.
-         *
-         * return the EventType
-         */
-         @Bindable
-         public EventType getEventType()
-         {
-            return eventType;
-         }
-
-         /**
-         * Sets the EventType.
-         *
-         * @param eventType the EventType
-         */
-         public void setEventType(EventType eventType)
-         {
-            this.eventType = eventType;
-            notifyPropertyChanged(BR.eventType);
-         }
-     
-     
-         /**
-         * Gets the Machine.
-         *
-         * return the Machine
-         */
-         @Bindable
-         public Machine getMachine()
-         {
-            return machine;
-         }
-
-         /**
-         * Sets the Machine.
-         *
-         * @param machine the Machine
-         */
-         public void setMachine(Machine machine)
-         {
-            this.machine = machine;
-            notifyPropertyChanged(BR.machine);
-         }
-     
-     
-         /**
-         * Gets the User.
-         *
-         * return the User
-         */
-         @Bindable
-         public User getUser()
-         {
-            return user;
-         }
-
-         /**
-         * Sets the User.
-         *
-         * @param user the User
-         */
-         public void setUser(User user)
-         {
-            this.user = user;
-            notifyPropertyChanged(BR.user);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaColor.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaColor.java
deleted file mode 100644
index 4c10d49cd..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaColor.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "MEDIA_COLORS", database = TangoDB.class, cachingEnabled = true)
-public class MediaColor extends MediaColorBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaColorBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaColorBase.java
deleted file mode 100644
index 116ebf2a4..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaColorBase.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class MediaColorBase extends Entity 
-    {
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "L")
-            private double l;
-
-    
-    
-            @Column(name = "A")
-            private double a;
-
-    
-    
-            @Column(name = "B")
-            private double b;
-
-    
-
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the L.
-         *
-         * return the L
-         */
-         @Bindable
-         public double getL()
-         {
-            return l;
-         }
-
-         /**
-         * Sets the L.
-         *
-         * @param l the L
-         */
-         public void setL(double l)
-         {
-            this.l = l;
-            notifyPropertyChanged(BR.l);
-         }
-     
-     
-         /**
-         * Gets the A.
-         *
-         * return the A
-         */
-         @Bindable
-         public double getA()
-         {
-            return a;
-         }
-
-         /**
-         * Sets the A.
-         *
-         * @param a the A
-         */
-         public void setA(double a)
-         {
-            this.a = a;
-            notifyPropertyChanged(BR.a);
-         }
-     
-     
-         /**
-         * Gets the B.
-         *
-         * return the B
-         */
-         @Bindable
-         public double getB()
-         {
-            return b;
-         }
-
-         /**
-         * Sets the B.
-         *
-         * @param b the B
-         */
-         public void setB(double b)
-         {
-            this.b = b;
-            notifyPropertyChanged(BR.b);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaCondition.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaCondition.java
deleted file mode 100644
index 5652028eb..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaCondition.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "MEDIA_CONDITIONS", database = TangoDB.class, cachingEnabled = true)
-public class MediaCondition extends MediaConditionBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaConditionBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaConditionBase.java
deleted file mode 100644
index f4aa62c8b..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaConditionBase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class MediaConditionBase extends Entity 
-    {
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "CODE")
-            private int code;
-
-    
-
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaMaterial.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaMaterial.java
deleted file mode 100644
index b40c543c8..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaMaterial.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "MEDIA_MATERIALS", database = TangoDB.class, cachingEnabled = true)
-public class MediaMaterial extends MediaMaterialBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaMaterialBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaMaterialBase.java
deleted file mode 100644
index b429f00c9..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaMaterialBase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class MediaMaterialBase extends Entity 
-    {
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "CODE")
-            private int code;
-
-    
-
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaPurpose.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaPurpose.java
deleted file mode 100644
index 086046e00..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaPurpose.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "MEDIA_PURPOSES", database = TangoDB.class, cachingEnabled = true)
-public class MediaPurpose extends MediaPurposeBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaPurposeBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaPurposeBase.java
deleted file mode 100644
index 0113bd234..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaPurposeBase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class MediaPurposeBase extends Entity 
-    {
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "CODE")
-            private int code;
-
-    
-
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MidTankType.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MidTankType.java
deleted file mode 100644
index 387c70784..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MidTankType.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "MID_TANK_TYPES", database = TangoDB.class, cachingEnabled = true)
-public class MidTankType extends MidTankTypeBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MidTankTypeBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MidTankTypeBase.java
deleted file mode 100644
index 5aaf29aee..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MidTankTypeBase.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class MidTankTypeBase extends Entity 
-    {
-    
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "LITER_CAPACITY")
-            private double literCapacity;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the LiterCapacity.
-         *
-         * return the LiterCapacity
-         */
-         @Bindable
-         public double getLiterCapacity()
-         {
-            return literCapacity;
-         }
-
-         /**
-         * Sets the LiterCapacity.
-         *
-         * @param literCapacity the LiterCapacity
-         */
-         public void setLiterCapacity(double literCapacity)
-         {
-            this.literCapacity = literCapacity;
-            notifyPropertyChanged(BR.literCapacity);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Organization.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Organization.java
deleted file mode 100644
index 50ccd7ecb..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Organization.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.sql.language.SQLite;
-import com.twine.tango.dal.TangoDB;
-
-import java.util.List;
-
-import static br.com.zbra.androidlinq.Linq.stream;
-
-@Table(name = "ORGANIZATIONS", database = TangoDB.class, cachingEnabled = true)
-public class Organization extends OrganizationBase
-{
-    public Organization()
-    {
-        super();
-        
-        setContact(new Contact());
-        setAddress(new Address());
-    }
-    
-    private List<Machine> machines;
-    
-    public List<Machine> getMachines()
-    {
-        if (machines == null)
-        {
-            machines = SQLite.select().from(Machine.class).where(Machine_Table.ORGANIZATION_GUID.eq(getGuid())).queryList();
-        }
-        
-        return machines;
-    }
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/OrganizationBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/OrganizationBase.java
deleted file mode 100644
index f58b9141f..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/OrganizationBase.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-
-import org.joda.time.DateTime;
-
-import com.twine.tango.dal.Entity;
-
-import android.databinding.Bindable;
-
-import com.twine.tango.dal.BR;
-
-
-public abstract class OrganizationBase extends Entity
-{
-    
-    @Column(name = "NAME")
-    private String name;
-    
-    
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "ADDRESS_GUID", foreignKeyColumnName = "GUID")})
-    private Address address;
-    
-    
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "CONTACT_GUID", foreignKeyColumnName = "GUID")})
-    private Contact contact;
-    
-    
-    /**
-     * Gets the Name.
-     * <p>
-     * return the Name
-     */
-    @Bindable
-    public String getName()
-    {
-        return name;
-    }
-    
-    /**
-     * Sets the Name.
-     *
-     * @param name the Name
-     */
-    public void setName(String name)
-    {
-        this.name = name;
-        notifyPropertyChanged(BR.name);
-    }
-    
-    
-    /**
-     * Gets the Address.
-     * <p>
-     * return the Address
-     */
-    @Bindable
-    public Address getAddress()
-    {
-        return address;
-    }
-    
-    /**
-     * Sets the Address.
-     *
-     * @param address the Address
-     */
-    public void setAddress(Address address)
-    {
-        this.address = address;
-        notifyPropertyChanged(BR.address);
-    }
-    
-    
-    /**
-     * Gets the Contact.
-     * <p>
-     * return the Contact
-     */
-    @Bindable
-    public Contact getContact()
-    {
-        return contact;
-    }
-    
-    /**
-     * Sets the Contact.
-     *
-     * @param contact the Contact
-     */
-    public void setContact(Contact contact)
-    {
-        this.contact = contact;
-        notifyPropertyChanged(BR.contact);
-    }
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Permission.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Permission.java
deleted file mode 100644
index efb19c8fd..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Permission.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "PERMISSIONS", database = TangoDB.class, cachingEnabled = true)
-public class Permission extends PermissionBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/PermissionBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/PermissionBase.java
deleted file mode 100644
index ecb650388..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/PermissionBase.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class PermissionBase extends Entity 
-    {
-    
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTable.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTable.java
deleted file mode 100644
index 4284ab4d3..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTable.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "PROCESS_PARAMETERS_TABLES", database = TangoDB.class, cachingEnabled = true)
-public class ProcessParametersTable extends ProcessParametersTableBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTableBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTableBase.java
deleted file mode 100644
index a1ad71938..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTableBase.java
+++ /dev/null
@@ -1,519 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class ProcessParametersTableBase extends Entity 
-    {
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DYEING_SPEED")
-            private double dyeingSpeed;
-
-    
-    
-            @Column(name = "MIXER_TEMP")
-            private double mixerTemp;
-
-    
-    
-            @Column(name = "DRYER_BUFFER_LENGTH")
-            private double dryerBufferLength;
-
-    
-    
-            @Column(name = "MIN_INK_UPTAKE")
-            private double minInkUptake;
-
-    
-    
-            @Column(name = "HEAD_ZONE1_TEMP")
-            private double headZone1Temp;
-
-    
-    
-            @Column(name = "DRYER_ZONE1_TEMP")
-            private double dryerZone1Temp;
-
-    
-    
-            @Column(name = "FEEDER_TENSION")
-            private double feederTension;
-
-    
-    
-            @Column(name = "DRYER_ZONE2_TEMP")
-            private double dryerZone2Temp;
-
-    
-    
-            @Column(name = "HEAD_ZONE2_TEMP")
-            private double headZone2Temp;
-
-    
-    
-            @Column(name = "PULLER_TENSION")
-            private double pullerTension;
-
-    
-    
-            @Column(name = "HEAD_ZONE3_TEMP")
-            private double headZone3Temp;
-
-    
-    
-            @Column(name = "DRYER_ZONE3_TEMP")
-            private double dryerZone3Temp;
-
-    
-    
-            @Column(name = "WINDER_TENSION")
-            private double winderTension;
-
-    
-    
-            @Column(name = "HEAD_AIR_FLOW")
-            private double headAirFlow;
-
-    
-    
-            @Column(name = "DRYER_AIR_FLOW")
-            private double dryerAirFlow;
-
-    
-    
-            @Column(name = "TABLE_INDEX")
-            private int tableIndex;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "PROCESS_PARAMETERS_TABLES_GROUP_GUID", foreignKeyColumnName = "GUID")})
-            private ProcessParametersTablesGroup processParametersTablesGroup;
-
-    
-
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the DyeingSpeed.
-         *
-         * return the DyeingSpeed
-         */
-         @Bindable
-         public double getDyeingSpeed()
-         {
-            return dyeingSpeed;
-         }
-
-         /**
-         * Sets the DyeingSpeed.
-         *
-         * @param dyeingSpeed the DyeingSpeed
-         */
-         public void setDyeingSpeed(double dyeingSpeed)
-         {
-            this.dyeingSpeed = dyeingSpeed;
-            notifyPropertyChanged(BR.dyeingSpeed);
-         }
-     
-     
-         /**
-         * Gets the MixerTemp.
-         *
-         * return the MixerTemp
-         */
-         @Bindable
-         public double getMixerTemp()
-         {
-            return mixerTemp;
-         }
-
-         /**
-         * Sets the MixerTemp.
-         *
-         * @param mixerTemp the MixerTemp
-         */
-         public void setMixerTemp(double mixerTemp)
-         {
-            this.mixerTemp = mixerTemp;
-            notifyPropertyChanged(BR.mixerTemp);
-         }
-     
-     
-         /**
-         * Gets the DryerBufferLength.
-         *
-         * return the DryerBufferLength
-         */
-         @Bindable
-         public double getDryerBufferLength()
-         {
-            return dryerBufferLength;
-         }
-
-         /**
-         * Sets the DryerBufferLength.
-         *
-         * @param dryerBufferLength the DryerBufferLength
-         */
-         public void setDryerBufferLength(double dryerBufferLength)
-         {
-            this.dryerBufferLength = dryerBufferLength;
-            notifyPropertyChanged(BR.dryerBufferLength);
-         }
-     
-     
-         /**
-         * Gets the MinInkUptake.
-         *
-         * return the MinInkUptake
-         */
-         @Bindable
-         public double getMinInkUptake()
-         {
-            return minInkUptake;
-         }
-
-         /**
-         * Sets the MinInkUptake.
-         *
-         * @param minInkUptake the MinInkUptake
-         */
-         public void setMinInkUptake(double minInkUptake)
-         {
-            this.minInkUptake = minInkUptake;
-            notifyPropertyChanged(BR.minInkUptake);
-         }
-     
-     
-         /**
-         * Gets the HeadZone1Temp.
-         *
-         * return the HeadZone1Temp
-         */
-         @Bindable
-         public double getHeadZone1Temp()
-         {
-            return headZone1Temp;
-         }
-
-         /**
-         * Sets the HeadZone1Temp.
-         *
-         * @param headZone1Temp the HeadZone1Temp
-         */
-         public void setHeadZone1Temp(double headZone1Temp)
-         {
-            this.headZone1Temp = headZone1Temp;
-            notifyPropertyChanged(BR.headZone1Temp);
-         }
-     
-     
-         /**
-         * Gets the DryerZone1Temp.
-         *
-         * return the DryerZone1Temp
-         */
-         @Bindable
-         public double getDryerZone1Temp()
-         {
-            return dryerZone1Temp;
-         }
-
-         /**
-         * Sets the DryerZone1Temp.
-         *
-         * @param dryerZone1Temp the DryerZone1Temp
-         */
-         public void setDryerZone1Temp(double dryerZone1Temp)
-         {
-            this.dryerZone1Temp = dryerZone1Temp;
-            notifyPropertyChanged(BR.dryerZone1Temp);
-         }
-     
-     
-         /**
-         * Gets the FeederTension.
-         *
-         * return the FeederTension
-         */
-         @Bindable
-         public double getFeederTension()
-         {
-            return feederTension;
-         }
-
-         /**
-         * Sets the FeederTension.
-         *
-         * @param feederTension the FeederTension
-         */
-         public void setFeederTension(double feederTension)
-         {
-            this.feederTension = feederTension;
-            notifyPropertyChanged(BR.feederTension);
-         }
-     
-     
-         /**
-         * Gets the DryerZone2Temp.
-         *
-         * return the DryerZone2Temp
-         */
-         @Bindable
-         public double getDryerZone2Temp()
-         {
-            return dryerZone2Temp;
-         }
-
-         /**
-         * Sets the DryerZone2Temp.
-         *
-         * @param dryerZone2Temp the DryerZone2Temp
-         */
-         public void setDryerZone2Temp(double dryerZone2Temp)
-         {
-            this.dryerZone2Temp = dryerZone2Temp;
-            notifyPropertyChanged(BR.dryerZone2Temp);
-         }
-     
-     
-         /**
-         * Gets the HeadZone2Temp.
-         *
-         * return the HeadZone2Temp
-         */
-         @Bindable
-         public double getHeadZone2Temp()
-         {
-            return headZone2Temp;
-         }
-
-         /**
-         * Sets the HeadZone2Temp.
-         *
-         * @param headZone2Temp the HeadZone2Temp
-         */
-         public void setHeadZone2Temp(double headZone2Temp)
-         {
-            this.headZone2Temp = headZone2Temp;
-            notifyPropertyChanged(BR.headZone2Temp);
-         }
-     
-     
-         /**
-         * Gets the PullerTension.
-         *
-         * return the PullerTension
-         */
-         @Bindable
-         public double getPullerTension()
-         {
-            return pullerTension;
-         }
-
-         /**
-         * Sets the PullerTension.
-         *
-         * @param pullerTension the PullerTension
-         */
-         public void setPullerTension(double pullerTension)
-         {
-            this.pullerTension = pullerTension;
-            notifyPropertyChanged(BR.pullerTension);
-         }
-     
-     
-         /**
-         * Gets the HeadZone3Temp.
-         *
-         * return the HeadZone3Temp
-         */
-         @Bindable
-         public double getHeadZone3Temp()
-         {
-            return headZone3Temp;
-         }
-
-         /**
-         * Sets the HeadZone3Temp.
-         *
-         * @param headZone3Temp the HeadZone3Temp
-         */
-         public void setHeadZone3Temp(double headZone3Temp)
-         {
-            this.headZone3Temp = headZone3Temp;
-            notifyPropertyChanged(BR.headZone3Temp);
-         }
-     
-     
-         /**
-         * Gets the DryerZone3Temp.
-         *
-         * return the DryerZone3Temp
-         */
-         @Bindable
-         public double getDryerZone3Temp()
-         {
-            return dryerZone3Temp;
-         }
-
-         /**
-         * Sets the DryerZone3Temp.
-         *
-         * @param dryerZone3Temp the DryerZone3Temp
-         */
-         public void setDryerZone3Temp(double dryerZone3Temp)
-         {
-            this.dryerZone3Temp = dryerZone3Temp;
-            notifyPropertyChanged(BR.dryerZone3Temp);
-         }
-     
-     
-         /**
-         * Gets the WinderTension.
-         *
-         * return the WinderTension
-         */
-         @Bindable
-         public double getWinderTension()
-         {
-            return winderTension;
-         }
-
-         /**
-         * Sets the WinderTension.
-         *
-         * @param winderTension the WinderTension
-         */
-         public void setWinderTension(double winderTension)
-         {
-            this.winderTension = winderTension;
-            notifyPropertyChanged(BR.winderTension);
-         }
-     
-     
-         /**
-         * Gets the HeadAirFlow.
-         *
-         * return the HeadAirFlow
-         */
-         @Bindable
-         public double getHeadAirFlow()
-         {
-            return headAirFlow;
-         }
-
-         /**
-         * Sets the HeadAirFlow.
-         *
-         * @param headAirFlow the HeadAirFlow
-         */
-         public void setHeadAirFlow(double headAirFlow)
-         {
-            this.headAirFlow = headAirFlow;
-            notifyPropertyChanged(BR.headAirFlow);
-         }
-     
-     
-         /**
-         * Gets the DryerAirFlow.
-         *
-         * return the DryerAirFlow
-         */
-         @Bindable
-         public double getDryerAirFlow()
-         {
-            return dryerAirFlow;
-         }
-
-         /**
-         * Sets the DryerAirFlow.
-         *
-         * @param dryerAirFlow the DryerAirFlow
-         */
-         public void setDryerAirFlow(double dryerAirFlow)
-         {
-            this.dryerAirFlow = dryerAirFlow;
-            notifyPropertyChanged(BR.dryerAirFlow);
-         }
-     
-     
-         /**
-         * Gets the TableIndex.
-         *
-         * return the TableIndex
-         */
-         @Bindable
-         public int getTableIndex()
-         {
-            return tableIndex;
-         }
-
-         /**
-         * Sets the TableIndex.
-         *
-         * @param tableIndex the TableIndex
-         */
-         public void setTableIndex(int tableIndex)
-         {
-            this.tableIndex = tableIndex;
-            notifyPropertyChanged(BR.tableIndex);
-         }
-     
-     
-         /**
-         * Gets the ProcessParametersTablesGroup.
-         *
-         * return the ProcessParametersTablesGroup
-         */
-         @Bindable
-         public ProcessParametersTablesGroup getProcessParametersTablesGroup()
-         {
-            return processParametersTablesGroup;
-         }
-
-         /**
-         * Sets the ProcessParametersTablesGroup.
-         *
-         * @param processParametersTablesGroup the ProcessParametersTablesGroup
-         */
-         public void setProcessParametersTablesGroup(ProcessParametersTablesGroup processParametersTablesGroup)
-         {
-            this.processParametersTablesGroup = processParametersTablesGroup;
-            notifyPropertyChanged(BR.processParametersTablesGroup);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTablesGroup.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTablesGroup.java
deleted file mode 100644
index 4652a0b1f..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTablesGroup.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "PROCESS_PARAMETERS_TABLES_GROUPS", database = TangoDB.class, cachingEnabled = true)
-public class ProcessParametersTablesGroup extends ProcessParametersTablesGroupBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTablesGroupBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTablesGroupBase.java
deleted file mode 100644
index c7c9c561e..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTablesGroupBase.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class ProcessParametersTablesGroupBase extends Entity 
-    {
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "ACTIVE")
-            private boolean active;
-
-    
-    
-            @Column(name = "SAVE_DATE")
-            private DateTime saveDate;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "RML_GUID", foreignKeyColumnName = "GUID")})
-            private Rml rml;
-
-    
-
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Active.
-         *
-         * return the Active
-         */
-         @Bindable
-         public boolean isActive()
-         {
-            return active;
-         }
-
-         /**
-         * Sets the Active.
-         *
-         * @param active the Active
-         */
-         public void setActive(boolean active)
-         {
-            this.active = active;
-            notifyPropertyChanged(BR.active);
-         }
-     
-     
-         /**
-         * Gets the SaveDate.
-         *
-         * return the SaveDate
-         */
-         @Bindable
-         public DateTime getSaveDate()
-         {
-            return saveDate;
-         }
-
-         /**
-         * Sets the SaveDate.
-         *
-         * @param saveDate the SaveDate
-         */
-         public void setSaveDate(DateTime saveDate)
-         {
-            this.saveDate = saveDate;
-            notifyPropertyChanged(BR.saveDate);
-         }
-     
-     
-         /**
-         * Gets the Rml.
-         *
-         * return the Rml
-         */
-         @Bindable
-         public Rml getRml()
-         {
-            return rml;
-         }
-
-         /**
-         * Sets the Rml.
-         *
-         * @param rml the Rml
-         */
-         public void setRml(Rml rml)
-         {
-            this.rml = rml;
-            notifyPropertyChanged(BR.rml);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Rml.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Rml.java
deleted file mode 100644
index f22a991bb..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Rml.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "RMLS", database = TangoDB.class, cachingEnabled = true)
-public class Rml extends RmlBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RmlBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RmlBase.java
deleted file mode 100644
index f3c24d0ae..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RmlBase.java
+++ /dev/null
@@ -1,575 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class RmlBase extends Entity 
-    {
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "MANUFACTURER")
-            private String manufacturer;
-
-    
-    
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "FIBER_SIZE")
-            private double fiberSize;
-
-    
-    
-            @Column(name = "NUMBER_OF_FIBERS")
-            private int numberOfFibers;
-
-    
-    
-            @Column(name = "PLIES_PER_FIBER")
-            private int pliesPerFiber;
-
-    
-    
-            @Column(name = "PLIES_PER_THREAD")
-            private int pliesPerThread;
-
-    
-    
-            @Column(name = "TWISTED")
-            private boolean twisted;
-
-    
-    
-            @Column(name = "AIR_ENTANGLEMENT")
-            private boolean airEntanglement;
-
-    
-    
-            @Column(name = "LUBRICANT")
-            private boolean lubricant;
-
-    
-    
-            @Column(name = "TENSILE_STRENGTH")
-            private double tensileStrength;
-
-    
-    
-            @Column(name = "ELONGATION_AT_BREAK_PERCENTAGE")
-            private double elongationAtBreakPercentage;
-
-    
-    
-            @Column(name = "ESTIMATED_THREAD_DIAMETER")
-            private double estimatedThreadDiameter;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "FIBER_SHAPE_GUID", foreignKeyColumnName = "GUID")})
-            private FiberShape fiberShape;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "FIBER_SYNTH_GUID", foreignKeyColumnName = "GUID")})
-            private FiberSynth fiberSynth;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "LINEAR_MASS_DENSITY_UNIT_GUID", foreignKeyColumnName = "GUID")})
-            private LinearMassDensityUnit linearMassDensityUnit;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "MEDIA_COLOR_GUID", foreignKeyColumnName = "GUID")})
-            private MediaColor mediaColor;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "MEDIA_CONDITION_GUID", foreignKeyColumnName = "GUID")})
-            private MediaCondition mediaCondition;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "MEDIA_MATERIAL_GUID", foreignKeyColumnName = "GUID")})
-            private MediaMaterial mediaMaterial;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "MEDIA_PURPOSE_GUID", foreignKeyColumnName = "GUID")})
-            private MediaPurpose mediaPurpose;
-
-    
-
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Manufacturer.
-         *
-         * return the Manufacturer
-         */
-         @Bindable
-         public String getManufacturer()
-         {
-            return manufacturer;
-         }
-
-         /**
-         * Sets the Manufacturer.
-         *
-         * @param manufacturer the Manufacturer
-         */
-         public void setManufacturer(String manufacturer)
-         {
-            this.manufacturer = manufacturer;
-            notifyPropertyChanged(BR.manufacturer);
-         }
-     
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the FiberSize.
-         *
-         * return the FiberSize
-         */
-         @Bindable
-         public double getFiberSize()
-         {
-            return fiberSize;
-         }
-
-         /**
-         * Sets the FiberSize.
-         *
-         * @param fiberSize the FiberSize
-         */
-         public void setFiberSize(double fiberSize)
-         {
-            this.fiberSize = fiberSize;
-            notifyPropertyChanged(BR.fiberSize);
-         }
-     
-     
-         /**
-         * Gets the NumberOfFibers.
-         *
-         * return the NumberOfFibers
-         */
-         @Bindable
-         public int getNumberOfFibers()
-         {
-            return numberOfFibers;
-         }
-
-         /**
-         * Sets the NumberOfFibers.
-         *
-         * @param numberOfFibers the NumberOfFibers
-         */
-         public void setNumberOfFibers(int numberOfFibers)
-         {
-            this.numberOfFibers = numberOfFibers;
-            notifyPropertyChanged(BR.numberOfFibers);
-         }
-     
-     
-         /**
-         * Gets the PliesPerFiber.
-         *
-         * return the PliesPerFiber
-         */
-         @Bindable
-         public int getPliesPerFiber()
-         {
-            return pliesPerFiber;
-         }
-
-         /**
-         * Sets the PliesPerFiber.
-         *
-         * @param pliesPerFiber the PliesPerFiber
-         */
-         public void setPliesPerFiber(int pliesPerFiber)
-         {
-            this.pliesPerFiber = pliesPerFiber;
-            notifyPropertyChanged(BR.pliesPerFiber);
-         }
-     
-     
-         /**
-         * Gets the PliesPerThread.
-         *
-         * return the PliesPerThread
-         */
-         @Bindable
-         public int getPliesPerThread()
-         {
-            return pliesPerThread;
-         }
-
-         /**
-         * Sets the PliesPerThread.
-         *
-         * @param pliesPerThread the PliesPerThread
-         */
-         public void setPliesPerThread(int pliesPerThread)
-         {
-            this.pliesPerThread = pliesPerThread;
-            notifyPropertyChanged(BR.pliesPerThread);
-         }
-     
-     
-         /**
-         * Gets the Twisted.
-         *
-         * return the Twisted
-         */
-         @Bindable
-         public boolean isTwisted()
-         {
-            return twisted;
-         }
-
-         /**
-         * Sets the Twisted.
-         *
-         * @param twisted the Twisted
-         */
-         public void setTwisted(boolean twisted)
-         {
-            this.twisted = twisted;
-            notifyPropertyChanged(BR.twisted);
-         }
-     
-     
-         /**
-         * Gets the AirEntanglement.
-         *
-         * return the AirEntanglement
-         */
-         @Bindable
-         public boolean isAirEntanglement()
-         {
-            return airEntanglement;
-         }
-
-         /**
-         * Sets the AirEntanglement.
-         *
-         * @param airEntanglement the AirEntanglement
-         */
-         public void setAirEntanglement(boolean airEntanglement)
-         {
-            this.airEntanglement = airEntanglement;
-            notifyPropertyChanged(BR.airEntanglement);
-         }
-     
-     
-         /**
-         * Gets the Lubricant.
-         *
-         * return the Lubricant
-         */
-         @Bindable
-         public boolean isLubricant()
-         {
-            return lubricant;
-         }
-
-         /**
-         * Sets the Lubricant.
-         *
-         * @param lubricant the Lubricant
-         */
-         public void setLubricant(boolean lubricant)
-         {
-            this.lubricant = lubricant;
-            notifyPropertyChanged(BR.lubricant);
-         }
-     
-     
-         /**
-         * Gets the TensileStrength.
-         *
-         * return the TensileStrength
-         */
-         @Bindable
-         public double getTensileStrength()
-         {
-            return tensileStrength;
-         }
-
-         /**
-         * Sets the TensileStrength.
-         *
-         * @param tensileStrength the TensileStrength
-         */
-         public void setTensileStrength(double tensileStrength)
-         {
-            this.tensileStrength = tensileStrength;
-            notifyPropertyChanged(BR.tensileStrength);
-         }
-     
-     
-         /**
-         * Gets the ElongationAtBreakPercentage.
-         *
-         * return the ElongationAtBreakPercentage
-         */
-         @Bindable
-         public double getElongationAtBreakPercentage()
-         {
-            return elongationAtBreakPercentage;
-         }
-
-         /**
-         * Sets the ElongationAtBreakPercentage.
-         *
-         * @param elongationAtBreakPercentage the ElongationAtBreakPercentage
-         */
-         public void setElongationAtBreakPercentage(double elongationAtBreakPercentage)
-         {
-            this.elongationAtBreakPercentage = elongationAtBreakPercentage;
-            notifyPropertyChanged(BR.elongationAtBreakPercentage);
-         }
-     
-     
-         /**
-         * Gets the EstimatedThreadDiameter.
-         *
-         * return the EstimatedThreadDiameter
-         */
-         @Bindable
-         public double getEstimatedThreadDiameter()
-         {
-            return estimatedThreadDiameter;
-         }
-
-         /**
-         * Sets the EstimatedThreadDiameter.
-         *
-         * @param estimatedThreadDiameter the EstimatedThreadDiameter
-         */
-         public void setEstimatedThreadDiameter(double estimatedThreadDiameter)
-         {
-            this.estimatedThreadDiameter = estimatedThreadDiameter;
-            notifyPropertyChanged(BR.estimatedThreadDiameter);
-         }
-     
-     
-         /**
-         * Gets the FiberShape.
-         *
-         * return the FiberShape
-         */
-         @Bindable
-         public FiberShape getFiberShape()
-         {
-            return fiberShape;
-         }
-
-         /**
-         * Sets the FiberShape.
-         *
-         * @param fiberShape the FiberShape
-         */
-         public void setFiberShape(FiberShape fiberShape)
-         {
-            this.fiberShape = fiberShape;
-            notifyPropertyChanged(BR.fiberShape);
-         }
-     
-     
-         /**
-         * Gets the FiberSynth.
-         *
-         * return the FiberSynth
-         */
-         @Bindable
-         public FiberSynth getFiberSynth()
-         {
-            return fiberSynth;
-         }
-
-         /**
-         * Sets the FiberSynth.
-         *
-         * @param fiberSynth the FiberSynth
-         */
-         public void setFiberSynth(FiberSynth fiberSynth)
-         {
-            this.fiberSynth = fiberSynth;
-            notifyPropertyChanged(BR.fiberSynth);
-         }
-     
-     
-         /**
-         * Gets the LinearMassDensityUnit.
-         *
-         * return the LinearMassDensityUnit
-         */
-         @Bindable
-         public LinearMassDensityUnit getLinearMassDensityUnit()
-         {
-            return linearMassDensityUnit;
-         }
-
-         /**
-         * Sets the LinearMassDensityUnit.
-         *
-         * @param linearMassDensityUnit the LinearMassDensityUnit
-         */
-         public void setLinearMassDensityUnit(LinearMassDensityUnit linearMassDensityUnit)
-         {
-            this.linearMassDensityUnit = linearMassDensityUnit;
-            notifyPropertyChanged(BR.linearMassDensityUnit);
-         }
-     
-     
-         /**
-         * Gets the MediaColor.
-         *
-         * return the MediaColor
-         */
-         @Bindable
-         public MediaColor getMediaColor()
-         {
-            return mediaColor;
-         }
-
-         /**
-         * Sets the MediaColor.
-         *
-         * @param mediaColor the MediaColor
-         */
-         public void setMediaColor(MediaColor mediaColor)
-         {
-            this.mediaColor = mediaColor;
-            notifyPropertyChanged(BR.mediaColor);
-         }
-     
-     
-         /**
-         * Gets the MediaCondition.
-         *
-         * return the MediaCondition
-         */
-         @Bindable
-         public MediaCondition getMediaCondition()
-         {
-            return mediaCondition;
-         }
-
-         /**
-         * Sets the MediaCondition.
-         *
-         * @param mediaCondition the MediaCondition
-         */
-         public void setMediaCondition(MediaCondition mediaCondition)
-         {
-            this.mediaCondition = mediaCondition;
-            notifyPropertyChanged(BR.mediaCondition);
-         }
-     
-     
-         /**
-         * Gets the MediaMaterial.
-         *
-         * return the MediaMaterial
-         */
-         @Bindable
-         public MediaMaterial getMediaMaterial()
-         {
-            return mediaMaterial;
-         }
-
-         /**
-         * Sets the MediaMaterial.
-         *
-         * @param mediaMaterial the MediaMaterial
-         */
-         public void setMediaMaterial(MediaMaterial mediaMaterial)
-         {
-            this.mediaMaterial = mediaMaterial;
-            notifyPropertyChanged(BR.mediaMaterial);
-         }
-     
-     
-         /**
-         * Gets the MediaPurpose.
-         *
-         * return the MediaPurpose
-         */
-         @Bindable
-         public MediaPurpose getMediaPurpose()
-         {
-            return mediaPurpose;
-         }
-
-         /**
-         * Sets the MediaPurpose.
-         *
-         * @param mediaPurpose the MediaPurpose
-         */
-         public void setMediaPurpose(MediaPurpose mediaPurpose)
-         {
-            this.mediaPurpose = mediaPurpose;
-            notifyPropertyChanged(BR.mediaPurpose);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Role.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Role.java
deleted file mode 100644
index a2388367b..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Role.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "ROLES", database = TangoDB.class, cachingEnabled = true)
-public class Role extends RoleBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RoleBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RoleBase.java
deleted file mode 100644
index 8101489e1..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RoleBase.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class RoleBase extends Entity 
-    {
-    
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RolesPermission.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RolesPermission.java
deleted file mode 100644
index 238a3461b..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RolesPermission.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "ROLES_PERMISSIONS", database = TangoDB.class, cachingEnabled = true)
-public class RolesPermission extends RolesPermissionBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RolesPermissionBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RolesPermissionBase.java
deleted file mode 100644
index 83042af4e..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RolesPermissionBase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class RolesPermissionBase extends Entity 
-    {
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "PERMISSION_GUID", foreignKeyColumnName = "GUID")})
-            private Permission permission;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "ROLE_GUID", foreignKeyColumnName = "GUID")})
-            private Role role;
-
-    
-
-     
-         /**
-         * Gets the Permission.
-         *
-         * return the Permission
-         */
-         @Bindable
-         public Permission getPermission()
-         {
-            return permission;
-         }
-
-         /**
-         * Sets the Permission.
-         *
-         * @param permission the Permission
-         */
-         public void setPermission(Permission permission)
-         {
-            this.permission = permission;
-            notifyPropertyChanged(BR.permission);
-         }
-     
-     
-         /**
-         * Gets the Role.
-         *
-         * return the Role
-         */
-         @Bindable
-         public Role getRole()
-         {
-            return role;
-         }
-
-         /**
-         * Sets the Role.
-         *
-         * @param role the Role
-         */
-         public void setRole(Role role)
-         {
-            this.role = role;
-            notifyPropertyChanged(BR.role);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Segment.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Segment.java
deleted file mode 100644
index a11367722..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Segment.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "SEGMENTS", database = TangoDB.class, cachingEnabled = true)
-public class Segment extends SegmentBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SegmentBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SegmentBase.java
deleted file mode 100644
index b917cea2a..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SegmentBase.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class SegmentBase extends Entity 
-    {
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "LENGTH")
-            private double length;
-
-    
-    
-            @Column(name = "SEGMENT_INDEX")
-            private int segmentIndex;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "JOB_GUID", foreignKeyColumnName = "GUID")})
-            private Job job;
-
-    
-
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Length.
-         *
-         * return the Length
-         */
-         @Bindable
-         public double getLength()
-         {
-            return length;
-         }
-
-         /**
-         * Sets the Length.
-         *
-         * @param length the Length
-         */
-         public void setLength(double length)
-         {
-            this.length = length;
-            notifyPropertyChanged(BR.length);
-         }
-     
-     
-         /**
-         * Gets the SegmentIndex.
-         *
-         * return the SegmentIndex
-         */
-         @Bindable
-         public int getSegmentIndex()
-         {
-            return segmentIndex;
-         }
-
-         /**
-         * Sets the SegmentIndex.
-         *
-         * @param segmentIndex the SegmentIndex
-         */
-         public void setSegmentIndex(int segmentIndex)
-         {
-            this.segmentIndex = segmentIndex;
-            notifyPropertyChanged(BR.segmentIndex);
-         }
-     
-     
-         /**
-         * Gets the Job.
-         *
-         * return the Job
-         */
-         @Bindable
-         public Job getJob()
-         {
-            return job;
-         }
-
-         /**
-         * Sets the Job.
-         *
-         * @param job the Job
-         */
-         public void setJob(Job job)
-         {
-            this.job = job;
-            notifyPropertyChanged(BR.job);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SpoolType.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SpoolType.java
deleted file mode 100644
index b9cb5520e..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SpoolType.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "SPOOL_TYPES", database = TangoDB.class, cachingEnabled = true)
-public class SpoolType extends SpoolTypeBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SpoolTypeBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SpoolTypeBase.java
deleted file mode 100644
index c0f9cd0c3..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SpoolTypeBase.java
+++ /dev/null
@@ -1,239 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class SpoolTypeBase extends Entity 
-    {
-    
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "LENGTH")
-            private double length;
-
-    
-    
-            @Column(name = "WEIGHT")
-            private double weight;
-
-    
-    
-            @Column(name = "DIAMETER")
-            private double diameter;
-
-    
-    
-            @Column(name = "START_OFFSET_PULSES")
-            private int startOffsetPulses;
-
-    
-    
-            @Column(name = "BACKING_RATE")
-            private int backingRate;
-
-    
-    
-            @Column(name = "SEGMENT_OFFSET_PULSES")
-            private int segmentOffsetPulses;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Length.
-         *
-         * return the Length
-         */
-         @Bindable
-         public double getLength()
-         {
-            return length;
-         }
-
-         /**
-         * Sets the Length.
-         *
-         * @param length the Length
-         */
-         public void setLength(double length)
-         {
-            this.length = length;
-            notifyPropertyChanged(BR.length);
-         }
-     
-     
-         /**
-         * Gets the Weight.
-         *
-         * return the Weight
-         */
-         @Bindable
-         public double getWeight()
-         {
-            return weight;
-         }
-
-         /**
-         * Sets the Weight.
-         *
-         * @param weight the Weight
-         */
-         public void setWeight(double weight)
-         {
-            this.weight = weight;
-            notifyPropertyChanged(BR.weight);
-         }
-     
-     
-         /**
-         * Gets the Diameter.
-         *
-         * return the Diameter
-         */
-         @Bindable
-         public double getDiameter()
-         {
-            return diameter;
-         }
-
-         /**
-         * Sets the Diameter.
-         *
-         * @param diameter the Diameter
-         */
-         public void setDiameter(double diameter)
-         {
-            this.diameter = diameter;
-            notifyPropertyChanged(BR.diameter);
-         }
-     
-     
-         /**
-         * Gets the StartOffsetPulses.
-         *
-         * return the StartOffsetPulses
-         */
-         @Bindable
-         public int getStartOffsetPulses()
-         {
-            return startOffsetPulses;
-         }
-
-         /**
-         * Sets the StartOffsetPulses.
-         *
-         * @param startOffsetPulses the StartOffsetPulses
-         */
-         public void setStartOffsetPulses(int startOffsetPulses)
-         {
-            this.startOffsetPulses = startOffsetPulses;
-            notifyPropertyChanged(BR.startOffsetPulses);
-         }
-     
-     
-         /**
-         * Gets the BackingRate.
-         *
-         * return the BackingRate
-         */
-         @Bindable
-         public int getBackingRate()
-         {
-            return backingRate;
-         }
-
-         /**
-         * Sets the BackingRate.
-         *
-         * @param backingRate the BackingRate
-         */
-         public void setBackingRate(int backingRate)
-         {
-            this.backingRate = backingRate;
-            notifyPropertyChanged(BR.backingRate);
-         }
-     
-     
-         /**
-         * Gets the SegmentOffsetPulses.
-         *
-         * return the SegmentOffsetPulses
-         */
-         @Bindable
-         public int getSegmentOffsetPulses()
-         {
-            return segmentOffsetPulses;
-         }
-
-         /**
-         * Sets the SegmentOffsetPulses.
-         *
-         * @param segmentOffsetPulses the SegmentOffsetPulses
-         */
-         public void setSegmentOffsetPulses(int segmentOffsetPulses)
-         {
-            this.segmentOffsetPulses = segmentOffsetPulses;
-            notifyPropertyChanged(BR.segmentOffsetPulses);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SyncConfiguration.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SyncConfiguration.java
deleted file mode 100644
index 6dfb752be..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SyncConfiguration.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "SYNC_CONFIGURATIONS", database = TangoDB.class, cachingEnabled = true)
-public class SyncConfiguration extends SyncConfigurationBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SyncConfigurationBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SyncConfigurationBase.java
deleted file mode 100644
index 3e8428983..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SyncConfigurationBase.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class SyncConfigurationBase extends Entity 
-    {
-
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechController.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechController.java
deleted file mode 100644
index fb29cab06..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechController.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "TECH_CONTROLLERS", database = TangoDB.class, cachingEnabled = true)
-public class TechController extends TechControllerBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechControllerBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechControllerBase.java
deleted file mode 100644
index 367f7c11e..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechControllerBase.java
+++ /dev/null
@@ -1,183 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class TechControllerBase extends Entity 
-    {
-    
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-    
-            @Column(name = "MIN")
-            private double min;
-
-    
-    
-            @Column(name = "MAX")
-            private double max;
-
-    
-    
-            @Column(name = "UNITS")
-            private String units;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-     
-         /**
-         * Gets the Min.
-         *
-         * return the Min
-         */
-         @Bindable
-         public double getMin()
-         {
-            return min;
-         }
-
-         /**
-         * Sets the Min.
-         *
-         * @param min the Min
-         */
-         public void setMin(double min)
-         {
-            this.min = min;
-            notifyPropertyChanged(BR.min);
-         }
-     
-     
-         /**
-         * Gets the Max.
-         *
-         * return the Max
-         */
-         @Bindable
-         public double getMax()
-         {
-            return max;
-         }
-
-         /**
-         * Sets the Max.
-         *
-         * @param max the Max
-         */
-         public void setMax(double max)
-         {
-            this.max = max;
-            notifyPropertyChanged(BR.max);
-         }
-     
-     
-         /**
-         * Gets the Units.
-         *
-         * return the Units
-         */
-         @Bindable
-         public String getUnits()
-         {
-            return units;
-         }
-
-         /**
-         * Sets the Units.
-         *
-         * @param units the Units
-         */
-         public void setUnits(String units)
-         {
-            this.units = units;
-            notifyPropertyChanged(BR.units);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechDispenser.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechDispenser.java
deleted file mode 100644
index ac66c7b2c..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechDispenser.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "TECH_DISPENSERS", database = TangoDB.class, cachingEnabled = true)
-public class TechDispenser extends TechDispenserBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechDispenserBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechDispenserBase.java
deleted file mode 100644
index 839e29f2b..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechDispenserBase.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class TechDispenserBase extends Entity 
-    {
-    
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechIo.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechIo.java
deleted file mode 100644
index ba1809bd3..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechIo.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "TECH_IOS", database = TangoDB.class, cachingEnabled = true)
-public class TechIo extends TechIoBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechIoBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechIoBase.java
deleted file mode 100644
index 38581baeb..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechIoBase.java
+++ /dev/null
@@ -1,211 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class TechIoBase extends Entity 
-    {
-    
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-    
-            @Column(name = "PORT")
-            private int port;
-
-    
-    
-            @Column(name = "TYPE")
-            private int type;
-
-    
-    
-            @Column(name = "MIN")
-            private double min;
-
-    
-    
-            @Column(name = "MAX")
-            private double max;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-     
-         /**
-         * Gets the Port.
-         *
-         * return the Port
-         */
-         @Bindable
-         public int getPort()
-         {
-            return port;
-         }
-
-         /**
-         * Sets the Port.
-         *
-         * @param port the Port
-         */
-         public void setPort(int port)
-         {
-            this.port = port;
-            notifyPropertyChanged(BR.port);
-         }
-     
-     
-         /**
-         * Gets the Type.
-         *
-         * return the Type
-         */
-         @Bindable
-         public int getType()
-         {
-            return type;
-         }
-
-         /**
-         * Sets the Type.
-         *
-         * @param type the Type
-         */
-         public void setType(int type)
-         {
-            this.type = type;
-            notifyPropertyChanged(BR.type);
-         }
-     
-     
-         /**
-         * Gets the Min.
-         *
-         * return the Min
-         */
-         @Bindable
-         public double getMin()
-         {
-            return min;
-         }
-
-         /**
-         * Sets the Min.
-         *
-         * @param min the Min
-         */
-         public void setMin(double min)
-         {
-            this.min = min;
-            notifyPropertyChanged(BR.min);
-         }
-     
-     
-         /**
-         * Gets the Max.
-         *
-         * return the Max
-         */
-         @Bindable
-         public double getMax()
-         {
-            return max;
-         }
-
-         /**
-         * Sets the Max.
-         *
-         * @param max the Max
-         */
-         public void setMax(double max)
-         {
-            this.max = max;
-            notifyPropertyChanged(BR.max);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMonitor.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMonitor.java
deleted file mode 100644
index 5324cdd6d..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMonitor.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "TECH_MONITORS", database = TangoDB.class, cachingEnabled = true)
-public class TechMonitor extends TechMonitorBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMonitorBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMonitorBase.java
deleted file mode 100644
index 921caf4b7..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMonitorBase.java
+++ /dev/null
@@ -1,267 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class TechMonitorBase extends Entity 
-    {
-    
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-    
-            @Column(name = "MIN")
-            private double min;
-
-    
-    
-            @Column(name = "MAX")
-            private double max;
-
-    
-    
-            @Column(name = "UNITS")
-            private String units;
-
-    
-    
-            @Column(name = "POINTS_PER_FRAME")
-            private int pointsPerFrame;
-
-    
-    
-            @Column(name = "MULTI_CHANNEL")
-            private boolean multiChannel;
-
-    
-    
-            @Column(name = "CHANNEL_COUNT")
-            private int channelCount;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-     
-         /**
-         * Gets the Min.
-         *
-         * return the Min
-         */
-         @Bindable
-         public double getMin()
-         {
-            return min;
-         }
-
-         /**
-         * Sets the Min.
-         *
-         * @param min the Min
-         */
-         public void setMin(double min)
-         {
-            this.min = min;
-            notifyPropertyChanged(BR.min);
-         }
-     
-     
-         /**
-         * Gets the Max.
-         *
-         * return the Max
-         */
-         @Bindable
-         public double getMax()
-         {
-            return max;
-         }
-
-         /**
-         * Sets the Max.
-         *
-         * @param max the Max
-         */
-         public void setMax(double max)
-         {
-            this.max = max;
-            notifyPropertyChanged(BR.max);
-         }
-     
-     
-         /**
-         * Gets the Units.
-         *
-         * return the Units
-         */
-         @Bindable
-         public String getUnits()
-         {
-            return units;
-         }
-
-         /**
-         * Sets the Units.
-         *
-         * @param units the Units
-         */
-         public void setUnits(String units)
-         {
-            this.units = units;
-            notifyPropertyChanged(BR.units);
-         }
-     
-     
-         /**
-         * Gets the PointsPerFrame.
-         *
-         * return the PointsPerFrame
-         */
-         @Bindable
-         public int getPointsPerFrame()
-         {
-            return pointsPerFrame;
-         }
-
-         /**
-         * Sets the PointsPerFrame.
-         *
-         * @param pointsPerFrame the PointsPerFrame
-         */
-         public void setPointsPerFrame(int pointsPerFrame)
-         {
-            this.pointsPerFrame = pointsPerFrame;
-            notifyPropertyChanged(BR.pointsPerFrame);
-         }
-     
-     
-         /**
-         * Gets the MultiChannel.
-         *
-         * return the MultiChannel
-         */
-         @Bindable
-         public boolean isMultiChannel()
-         {
-            return multiChannel;
-         }
-
-         /**
-         * Sets the MultiChannel.
-         *
-         * @param multiChannel the MultiChannel
-         */
-         public void setMultiChannel(boolean multiChannel)
-         {
-            this.multiChannel = multiChannel;
-            notifyPropertyChanged(BR.multiChannel);
-         }
-     
-     
-         /**
-         * Gets the ChannelCount.
-         *
-         * return the ChannelCount
-         */
-         @Bindable
-         public int getChannelCount()
-         {
-            return channelCount;
-         }
-
-         /**
-         * Sets the ChannelCount.
-         *
-         * @param channelCount the ChannelCount
-         */
-         public void setChannelCount(int channelCount)
-         {
-            this.channelCount = channelCount;
-            notifyPropertyChanged(BR.channelCount);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMotor.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMotor.java
deleted file mode 100644
index 0dd2fe139..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMotor.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "TECH_MOTORS", database = TangoDB.class, cachingEnabled = true)
-public class TechMotor extends TechMotorBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMotorBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMotorBase.java
deleted file mode 100644
index f56865c88..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMotorBase.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class TechMotorBase extends Entity 
-    {
-    
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-    
-            @Column(name = "SUPPORTS_HOMING")
-            private boolean supportsHoming;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-     
-         /**
-         * Gets the SupportsHoming.
-         *
-         * return the SupportsHoming
-         */
-         @Bindable
-         public boolean isSupportsHoming()
-         {
-            return supportsHoming;
-         }
-
-         /**
-         * Sets the SupportsHoming.
-         *
-         * @param supportsHoming the SupportsHoming
-         */
-         public void setSupportsHoming(boolean supportsHoming)
-         {
-            this.supportsHoming = supportsHoming;
-            notifyPropertyChanged(BR.supportsHoming);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechValf.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechValf.java
deleted file mode 100644
index 8b577e74c..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechValf.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "TECH_VALVES", database = TangoDB.class, cachingEnabled = true)
-public class TechValf extends TechValfBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechValfBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechValfBase.java
deleted file mode 100644
index 40e726e7a..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechValfBase.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class TechValfBase extends Entity 
-    {
-    
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/User.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/User.java
deleted file mode 100644
index 11f23f1e2..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/User.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "USERS", database = TangoDB.class, cachingEnabled = true)
-public class User extends UserBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UserBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UserBase.java
deleted file mode 100644
index d2f741dec..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UserBase.java
+++ /dev/null
@@ -1,183 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class UserBase extends Entity 
-    {
-    
-            @Column(name = "DELETED")
-            private boolean deleted;
-
-    
-    
-            @Column(name = "EMAIL")
-            private String email;
-
-    
-    
-            @Column(name = "PASSWORD")
-            private String password;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "ADDRESS_GUID", foreignKeyColumnName = "GUID")})
-            private Address address;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "CONTACT_GUID", foreignKeyColumnName = "GUID")})
-            private Contact contact;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "ORGANIZATION_GUID", foreignKeyColumnName = "GUID")})
-            private Organization organization;
-
-    
-
-     
-         /**
-         * Gets the Deleted.
-         *
-         * return the Deleted
-         */
-         @Bindable
-         public boolean isDeleted()
-         {
-            return deleted;
-         }
-
-         /**
-         * Sets the Deleted.
-         *
-         * @param deleted the Deleted
-         */
-         public void setDeleted(boolean deleted)
-         {
-            this.deleted = deleted;
-            notifyPropertyChanged(BR.deleted);
-         }
-     
-     
-         /**
-         * Gets the Email.
-         *
-         * return the Email
-         */
-         @Bindable
-         public String getEmail()
-         {
-            return email;
-         }
-
-         /**
-         * Sets the Email.
-         *
-         * @param email the Email
-         */
-         public void setEmail(String email)
-         {
-            this.email = email;
-            notifyPropertyChanged(BR.email);
-         }
-     
-     
-         /**
-         * Gets the Password.
-         *
-         * return the Password
-         */
-         @Bindable
-         public String getPassword()
-         {
-            return password;
-         }
-
-         /**
-         * Sets the Password.
-         *
-         * @param password the Password
-         */
-         public void setPassword(String password)
-         {
-            this.password = password;
-            notifyPropertyChanged(BR.password);
-         }
-     
-     
-         /**
-         * Gets the Address.
-         *
-         * return the Address
-         */
-         @Bindable
-         public Address getAddress()
-         {
-            return address;
-         }
-
-         /**
-         * Sets the Address.
-         *
-         * @param address the Address
-         */
-         public void setAddress(Address address)
-         {
-            this.address = address;
-            notifyPropertyChanged(BR.address);
-         }
-     
-     
-         /**
-         * Gets the Contact.
-         *
-         * return the Contact
-         */
-         @Bindable
-         public Contact getContact()
-         {
-            return contact;
-         }
-
-         /**
-         * Sets the Contact.
-         *
-         * @param contact the Contact
-         */
-         public void setContact(Contact contact)
-         {
-            this.contact = contact;
-            notifyPropertyChanged(BR.contact);
-         }
-     
-     
-         /**
-         * Gets the Organization.
-         *
-         * return the Organization
-         */
-         @Bindable
-         public Organization getOrganization()
-         {
-            return organization;
-         }
-
-         /**
-         * Sets the Organization.
-         *
-         * @param organization the Organization
-         */
-         public void setOrganization(Organization organization)
-         {
-            this.organization = organization;
-            notifyPropertyChanged(BR.organization);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UsersRole.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UsersRole.java
deleted file mode 100644
index 4846c6f74..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UsersRole.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "USERS_ROLES", database = TangoDB.class, cachingEnabled = true)
-public class UsersRole extends UsersRoleBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UsersRoleBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UsersRoleBase.java
deleted file mode 100644
index 20025896f..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UsersRoleBase.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class UsersRoleBase extends Entity 
-    {
-    
-            @Column(name = "DELETED")
-            private boolean deleted;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "ROLE_GUID", foreignKeyColumnName = "GUID")})
-            private Role role;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "USER_GUID", foreignKeyColumnName = "GUID")})
-            private User user;
-
-    
-
-     
-         /**
-         * Gets the Deleted.
-         *
-         * return the Deleted
-         */
-         @Bindable
-         public boolean isDeleted()
-         {
-            return deleted;
-         }
-
-         /**
-         * Sets the Deleted.
-         *
-         * @param deleted the Deleted
-         */
-         public void setDeleted(boolean deleted)
-         {
-            this.deleted = deleted;
-            notifyPropertyChanged(BR.deleted);
-         }
-     
-     
-         /**
-         * Gets the Role.
-         *
-         * return the Role
-         */
-         @Bindable
-         public Role getRole()
-         {
-            return role;
-         }
-
-         /**
-         * Sets the Role.
-         *
-         * @param role the Role
-         */
-         public void setRole(Role role)
-         {
-            this.role = role;
-            notifyPropertyChanged(BR.role);
-         }
-     
-     
-         /**
-         * Gets the User.
-         *
-         * return the User
-         */
-         @Bindable
-         public User getUser()
-         {
-            return user;
-         }
-
-         /**
-         * Sets the User.
-         *
-         * @param user the User
-         */
-         public void setUser(User user)
-         {
-            this.user = user;
-            notifyPropertyChanged(BR.user);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/WindingMethod.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/WindingMethod.java
deleted file mode 100644
index 92a0ed10f..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/WindingMethod.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.twine.tango.dal.TangoDB;
-
-@Table(name = "WINDING_METHODS", database = TangoDB.class, cachingEnabled = true)
-public class WindingMethod extends WindingMethodBase
-{
-
-    
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/WindingMethodBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/WindingMethodBase.java
deleted file mode 100644
index 08a35c7fa..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/WindingMethodBase.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
-
-
-    public abstract class WindingMethodBase extends Entity 
-    {
-    
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/ActionTypes.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/ActionTypes.java
deleted file mode 100644
index 5677a84c7..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/ActionTypes.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.twine.tango.dal.enumerations;
-
-import com.twine.tango.core.DescriptionAnnotation;
-
-public enum ActionTypes
-{
-
-    @DescriptionAnnotation(description = "Prevents the user from executing jobs")
-    PreventJobExecution(0),
-
-    @DescriptionAnnotation(description = "Abort a running job if is in progress")
-    AbortRunningJob(1),
-
-    @DescriptionAnnotation(description = "Stops the heaters funcionality")
-    StopHeaters(2),
-
-    @DescriptionAnnotation(description = "System Shutdown")
-    OverallPowerDown(3),
-
-    @DescriptionAnnotation(description = "Displays a graceful notification to the user")
-    SoftVisualNotification(4),
-
-    ;
-
-    private int value;
-
-    ActionTypes(int value)
-    {
-        this.value = value;
-    }
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/CartridgeTypes.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/CartridgeTypes.java
deleted file mode 100644
index 7be6a56e6..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/CartridgeTypes.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.twine.tango.dal.enumerations;
-
-import com.twine.tango.core.DescriptionAnnotation;
-
-public enum CartridgeTypes
-{
-
-    @DescriptionAnnotation(description = "Cartridge 1")
-    Cartridge1(1),
-
-    ;
-
-    private int value;
-
-    CartridgeTypes(int value)
-    {
-        this.value = value;
-    }
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/ColorSpaces.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/ColorSpaces.java
deleted file mode 100644
index 75985ebd6..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/ColorSpaces.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.twine.tango.dal.enumerations;
-
-import com.twine.tango.core.DescriptionAnnotation;
-
-public enum ColorSpaces
-{
-
-    @DescriptionAnnotation(description = "Volume")
-    Volume(0),
-
-    @DescriptionAnnotation(description = "RGB")
-    RGB(1),
-
-    @DescriptionAnnotation(description = "CMYK")
-    CMYK(2),
-
-    @DescriptionAnnotation(description = "LAB")
-    LAB(3),
-
-    @DescriptionAnnotation(description = "PANTON")
-    PANTON(4),
-
-    ;
-
-    private int value;
-
-    ColorSpaces(int value)
-    {
-        this.value = value;
-    }
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/DispenserTypes.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/DispenserTypes.java
deleted file mode 100644
index 0bca3db74..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/DispenserTypes.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.twine.tango.dal.enumerations;
-
-import com.twine.tango.core.DescriptionAnnotation;
-
-public enum DispenserTypes
-{
-
-    @DescriptionAnnotation(description = "Standard Dispenser")
-    StandardDispenser(0),
-
-    ;
-
-    private int value;
-
-    DispenserTypes(int value)
-    {
-        this.value = value;
-    }
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/EnumDemo.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/EnumDemo.java
deleted file mode 100644
index a92d6aefa..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/EnumDemo.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.twine.tango.dal.enumerations;
-
-import com.twine.tango.core.DescriptionAnnotation;
-
-public enum EnumDemo
-{
-    @DescriptionAnnotation(description = "Hi")
-    PENNY(1),
-    NICKLE(5),
-    DIME(10),
-    QUARTER(25);
-    
-    
-    private int value;
-    
-    EnumDemo(int value)
-    {
-        this.value = value;
-    }
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/EventTypes.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/EventTypes.java
deleted file mode 100644
index f23db3fa1..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/EventTypes.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package com.twine.tango.dal.enumerations;
-
-import com.twine.tango.core.DescriptionAnnotation;
-
-public enum EventTypes
-{
-
-    @DescriptionAnnotation(description = "Dancer overshot / Thread break sensor")
-    ThreadBreak(0),
-
-    @DescriptionAnnotation(description = "Dancer not stable or got down")
-    ThreadTensionControlFailure(1),
-
-    @DescriptionAnnotation(description = "Source thread counter (counter shall be reset upon loading a new cone)")
-    FeederConeInsufficiant(2),
-
-    @DescriptionAnnotation(description = "Winder Controller")
-    WinderGeneralError(3),
-
-    @DescriptionAnnotation(description = "SW_SPOOL_EXISTS='0' or Winder Controller")
-    WinderConeNotExists(4),
-
-    @DescriptionAnnotation(description = "Motor Stall")
-    ThreadFeedingGeneralError(5),
-
-    @DescriptionAnnotation(description = "Dyeing Head Thermometers")
-    DyeingHeadOverTemperature(6),
-
-    @DescriptionAnnotation(description = "Current sense in all heaters is 0")
-    DHThermalCutoff(7),
-
-    @DescriptionAnnotation(description = "Dryer Thermometers")
-    DryerOverTemperature(8),
-
-    @DescriptionAnnotation(description = "Current sense in all heaters is 0")
-    DryerThermalCutoff(9),
-
-    @DescriptionAnnotation(description = "Dyeing head Heaters failure (Under /Over current)")
-    DyeingHeadHeatersCurrentOutOfRange(10),
-
-    @DescriptionAnnotation(description = "Dryer Heaters failure (Under /Over current)")
-    DryerHeatersCurrentOutOfRange(11),
-
-    @DescriptionAnnotation(description = "Covers Tampers")
-    DryerDHeadCoverOpen(12),
-
-    @DescriptionAnnotation(description = "Pressure sensor Purex or Air flow sensor (Flap)")
-    AirFilterClogged(13),
-
-    @DescriptionAnnotation(description = "Micro-switch")
-    AirFilterNotInstalled(14),
-
-    @DescriptionAnnotation(description = "blower techo. Feedback, air flap")
-    WHSFailure(15),
-
-    @DescriptionAnnotation(description = "Check container float sensor")
-    WasteContainerIsAlmostFull(16),
-
-    @DescriptionAnnotation(description = "Check container float sensor")
-    WasteContainerIsFull(17),
-
-    @DescriptionAnnotation(description = "Dispenser position sensor/s")
-    DispenserEmpty(18),
-
-    @DescriptionAnnotation(description = "Check if job can be executor refill needed")
-    DispenserLowLevel(19),
-
-    @DescriptionAnnotation(description = "Cartridge float displacement")
-    DispenserRefillFailure(20),
-
-    @DescriptionAnnotation(description = "Mid-Tank ")
-    MidTankEmpty(21),
-
-    @DescriptionAnnotation(description = "Cartridge float sensor")
-    MidTankLowLevel(22),
-
-    @DescriptionAnnotation(description = "Cartridge float sensor or Additional micro-switch")
-    MidTankNotInPlace(23),
-
-    @DescriptionAnnotation(description = "System BIT Failure")
-    SystemBITFail(24),
-
-    @DescriptionAnnotation(description = "Internal Thermostat")
-    GeneralInternalOverTemperature(25),
-
-    @DescriptionAnnotation(description = "Covers Tampers")
-    MachineCoverOpen(26),
-
-    @DescriptionAnnotation(description = "EPB")
-    EmergencyPushButtonPressed(27),
-
-    @DescriptionAnnotation(description = "System General Error")
-    SystemGeneralError(28),
-
-    @DescriptionAnnotation(description = "Occurs a request has been sent to the machine or external bridge service")
-    RequestSent(29),
-
-    @DescriptionAnnotation(description = "Occures when a response has been received")
-    ResponseReceived(30),
-
-    @DescriptionAnnotation(description = "Occures when a request to the machine has failed")
-    RequestFailed(31),
-
-    @DescriptionAnnotation(description = "Occures when the application has encountered some error")
-    ApplicationException(32),
-
-    @DescriptionAnnotation(description = "General application event logs")
-    ApplicationInformation(34),
-
-    ;
-
-    private int value;
-
-    EventTypes(int value)
-    {
-        this.value = value;
-    }
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/EventTypesCategories.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/EventTypesCategories.java
deleted file mode 100644
index 4395e4ed6..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/EventTypesCategories.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.twine.tango.dal.enumerations;
-
-import com.twine.tango.core.DescriptionAnnotation;
-
-public enum EventTypesCategories
-{
-
-    @DescriptionAnnotation(description = "General information")
-    Info(0),
-
-    @DescriptionAnnotation(description = "Hardware or software warning")
-    Warning(1),
-
-    @DescriptionAnnotation(description = "Hardware or software error")
-    Error(2),
-
-    @DescriptionAnnotation(description = "Critical hardware or software error")
-    Critical(3),
-
-    ;
-
-    private int value;
-
-    EventTypesCategories(int value)
-    {
-        this.value = value;
-    }
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/EventTypesGroups.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/EventTypesGroups.java
deleted file mode 100644
index 1fe1780d9..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/EventTypesGroups.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.twine.tango.dal.enumerations;
-
-import com.twine.tango.core.DescriptionAnnotation;
-
-public enum EventTypesGroups
-{
-
-    @DescriptionAnnotation(description = "Thread Feeding System")
-    ThreadFeedingSystem(0),
-
-    @DescriptionAnnotation(description = "DH & Dryer")
-    DHDryer(1),
-
-    @DescriptionAnnotation(description = "Waste Handling System (WHS)")
-    WasteHandlingSystem(2),
-
-    @DescriptionAnnotation(description = "Ink Delivery System (IDS)")
-    InkDeliverySystem(3),
-
-    @DescriptionAnnotation(description = "General Hardware")
-    GeneralHardware(4),
-
-    @DescriptionAnnotation(description = "Messages exchange to and from the machine")
-    Transport(5),
-
-    @DescriptionAnnotation(description = "Application related events")
-    Application(6),
-
-    ;
-
-    private int value;
-
-    EventTypesGroups(int value)
-    {
-        this.value = value;
-    }
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/FiberShapes.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/FiberShapes.java
deleted file mode 100644
index 10411d66a..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/FiberShapes.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.twine.tango.dal.enumerations;
-
-import com.twine.tango.core.DescriptionAnnotation;
-
-public enum FiberShapes
-{
-
-    @DescriptionAnnotation(description = "Triangle")
-    Triangle(1),
-
-    ;
-
-    private int value;
-
-    FiberShapes(int value)
-    {
-        this.value = value;
-    }
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/FiberSynths.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/FiberSynths.java
deleted file mode 100644
index 03f2f950b..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/FiberSynths.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.twine.tango.dal.enumerations;
-
-import com.twine.tango.core.DescriptionAnnotation;
-
-public enum FiberSynths
-{
-
-    @DescriptionAnnotation(description = "Some syntheses type")
-    Somesynthesestype(1),
-
-    ;
-
-    private int value;
-
-    FiberSynths(int value)
-    {
-        this.value = value;
-    }
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/HardwareDancerTypes.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/HardwareDancerTypes.java
deleted file mode 100644
index 8a5107a3a..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/HardwareDancerTypes.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.twine.tango.dal.enumerations;
-
-import com.twine.tango.core.DescriptionAnnotation;
-
-public enum HardwareDancerTypes
-{
-
-    @DescriptionAnnotation(description = "Middle Dancer")
-    MiddleDancer(1),
-
-    @DescriptionAnnotation(description = "Left Dancer")
-    LeftDancer(0),
-
-    @DescriptionAnnotation(description = "Right Dancer")
-    RightDancer(2),
-
-    ;
-
-    private int value;
-
-    HardwareDancerTypes(int value)
-    {
-        this.value = value;
-    }
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/HardwareMotorTypes.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/HardwareMotorTypes.java
deleted file mode 100644
index 76df00013..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/HardwareMotorTypes.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package com.twine.tango.dal.enumerations;
-
-import com.twine.tango.core.DescriptionAnnotation;
-
-public enum HardwareMotorTypes
-{
-
-    @DescriptionAnnotation(description = "Cleaning Head Motor")
-    MOTO_DH_CLEANHEAD(0),
-
-    @DescriptionAnnotation(description = "Cleaning Mechanism Motor")
-    MOTO_DH_CLEANMECH(1),
-
-    @DescriptionAnnotation(description = "Dyeing Head Lid Motor")
-    MOTO_DH_LID(2),
-
-    @DescriptionAnnotation(description = "Dryer Main Motor")
-    MOTO_DRYER_DRIVING(3),
-
-    @DescriptionAnnotation(description = "Drier Lid Motor")
-    MOTO_DRYER_LID(4),
-
-    @DescriptionAnnotation(description = "Drier Thread Loading Arm Motor")
-    MOTO_DRYER_LOADARM(5),
-
-    @DescriptionAnnotation(description = "Dispenser 1 Motor")
-    MOTO_DISPENSER_1(6),
-
-    @DescriptionAnnotation(description = "Dispenser 2 Motor")
-    MOTO_DISPENSER_2(7),
-
-    @DescriptionAnnotation(description = "Dispenser 3 Motor")
-    MOTO_DISPENSER_3(8),
-
-    @DescriptionAnnotation(description = "Dispenser 4 Motor")
-    MOTO_DISPENSER_4(9),
-
-    @DescriptionAnnotation(description = "Dispenser 5 Motor")
-    MOTO_DISPENSER_5(10),
-
-    @DescriptionAnnotation(description = "Dispenser 6 Motor")
-    MOTO_DISPENSER_6(11),
-
-    @DescriptionAnnotation(description = "Dispenser 7 Motor")
-    MOTO_DISPENSER_7(12),
-
-    @DescriptionAnnotation(description = "Dispenser 8 Motor")
-    MOTO_DISPENSER_8(13),
-
-    @DescriptionAnnotation(description = "Winder Screw Motor")
-    MOTO_SCREW(14),
-
-    @DescriptionAnnotation(description = "Winder Motor")
-    MOTO_WINDER(15),
-
-    @DescriptionAnnotation(description = "Pooler Dancer Adjustment")
-    MOTO_LDANCER1(16),
-
-    @DescriptionAnnotation(description = "Winder Dancer Adjustment #1")
-    MOTO_LDANCER2(17),
-
-    @DescriptionAnnotation(description = "Pooler Motor")
-    MOTO_LDRIVING(18),
-
-    @DescriptionAnnotation(description = "Pooler Loading Motor")
-    MOTO_LLOADING(19),
-
-    @DescriptionAnnotation(description = "Pooler Loading Pivot Arm Motor")
-    MOTO_LPIVOT1(20),
-
-    @DescriptionAnnotation(description = "Feeder Dancer Adjustment Motor")
-    MOTO_RDANCER(21),
-
-    @DescriptionAnnotation(description = "Feeder Motor")
-    MOTO_RDRIVING(22),
-
-    @DescriptionAnnotation(description = "Right Loading Arm Motor")
-    MOTO_RLOADARM(23),
-
-    @DescriptionAnnotation(description = "Right Loading Motor")
-    MOTO_RLOADING(24),
-
-    @DescriptionAnnotation(description = "Spare 1 Motor")
-    MOTO_SPARE1_1(25),
-
-    @DescriptionAnnotation(description = "Spare 2 Motor")
-    MOTO_SPARE1_2(26),
-
-    @DescriptionAnnotation(description = "Spare 3 Motor")
-    MOTO_SPARE2_1(27),
-
-    @DescriptionAnnotation(description = "Spare 4 Motor")
-    MOTO_SPARE2_2(28),
-
-    ;
-
-    private int value;
-
-    HardwareMotorTypes(int value)
-    {
-        this.value = value;
-    }
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/HardwarePidControlTypes.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/HardwarePidControlTypes.java
deleted file mode 100644
index 45a372f01..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/HardwarePidControlTypes.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.twine.tango.dal.enumerations;
-
-import com.twine.tango.core.DescriptionAnnotation;
-
-public enum HardwarePidControlTypes
-{
-
-    @DescriptionAnnotation(description = "Mixer Heater")
-    MixerHeater(7),
-
-    @DescriptionAnnotation(description = "Waste Control")
-    WasteControl(8),
-
-    @DescriptionAnnotation(description = "Winder Motor")
-    MotorWinder(12),
-
-    @DescriptionAnnotation(description = "Feeder Motor")
-    MotorFeeder(10),
-
-    @DescriptionAnnotation(description = "Dryer Motor")
-    MotorDryer(9),
-
-    @DescriptionAnnotation(description = "Dryer Heater 200w 1")
-    DryerHeater200w1(1),
-
-    @DescriptionAnnotation(description = "Pooler Motor")
-    MotorPooler(11),
-
-    @DescriptionAnnotation(description = "Head Heater Zone 4")
-    HeadHeaterZ4(6),
-
-    @DescriptionAnnotation(description = "Dryer Heater 1000w")
-    DryerHeater1000w(0),
-
-    @DescriptionAnnotation(description = "Head Heater Zone 3")
-    HeadHeaterZ3(5),
-
-    @DescriptionAnnotation(description = "Head Heater Zone 1")
-    HeadHeaterZ1(3),
-
-    @DescriptionAnnotation(description = "Head Heater Zone 2")
-    HeadHeaterZ2(4),
-
-    @DescriptionAnnotation(description = "Dryer Heater 400")
-    DryerHeater400(13),
-
-    @DescriptionAnnotation(description = "Dryer Heater 200w 2 ")
-    DryerHeater200w2(2),
-
-    ;
-
-    private int value;
-
-    HardwarePidControlTypes(int value)
-    {
-        this.value = value;
-    }
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/HardwareWinderTypes.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/HardwareWinderTypes.java
deleted file mode 100644
index c8795ff0c..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/HardwareWinderTypes.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.twine.tango.dal.enumerations;
-
-import com.twine.tango.core.DescriptionAnnotation;
-
-public enum HardwareWinderTypes
-{
-
-    @DescriptionAnnotation(description = "Internal Winder")
-    InternalWinder(0),
-
-    ;
-
-    private int value;
-
-    HardwareWinderTypes(int value)
-    {
-        this.value = value;
-    }
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/IdsPackFormulas.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/IdsPackFormulas.java
deleted file mode 100644
index d38206396..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/IdsPackFormulas.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.twine.tango.dal.enumerations;
-
-import com.twine.tango.core.DescriptionAnnotation;
-
-public enum IdsPackFormulas
-{
-
-    @DescriptionAnnotation(description = "Lubricant Formula")
-    Lubricant(2),
-
-    @DescriptionAnnotation(description = "Standard Color IDS Pack Formula")
-    StandardColor(0),
-
-    @DescriptionAnnotation(description = "Diluter Formula")
-    TransparentLiquid(1),
-
-    ;
-
-    private int value;
-
-    IdsPackFormulas(int value)
-    {
-        this.value = value;
-    }
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/LinearMassDensityUnits.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/LinearMassDensityUnits.java
deleted file mode 100644
index 1cc561b63..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/LinearMassDensityUnits.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.twine.tango.dal.enumerations;
-
-import com.twine.tango.core.DescriptionAnnotation;
-
-public enum LinearMassDensityUnits
-{
-
-    @DescriptionAnnotation(description = "Dex")
-    Dex(1),
-
-    ;
-
-    private int value;
-
-    LinearMassDensityUnits(int value)
-    {
-        this.value = value;
-    }
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/LiquidTypes.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/LiquidTypes.java
deleted file mode 100644
index 7a6187d31..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/LiquidTypes.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.twine.tango.dal.enumerations;
-
-import com.twine.tango.core.DescriptionAnnotation;
-
-public enum LiquidTypes
-{
-
-    @DescriptionAnnotation(description = "Cyan")
-    Cyan(0),
-
-    @DescriptionAnnotation(description = "Red")
-    Red(7),
-
-    @DescriptionAnnotation(description = "Transparent Ink")
-    TransparentInk(4),
-
-    @DescriptionAnnotation(description = "Magenta")
-    Magenta(1),
-
-    @DescriptionAnnotation(description = "Lubricant")
-    Lubricant(5),
-
-    @DescriptionAnnotation(description = "Yellow")
-    Yellow(2),
-
-    @DescriptionAnnotation(description = "Black")
-    Black(3),
-
-    ;
-
-    private int value;
-
-    LiquidTypes(int value)
-    {
-        this.value = value;
-    }
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaConditions.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaConditions.java
deleted file mode 100644
index b083f111a..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaConditions.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.twine.tango.dal.enumerations;
-
-import com.twine.tango.core.DescriptionAnnotation;
-
-public enum MediaConditions
-{
-
-    @DescriptionAnnotation(description = "Treated")
-    Treated(1),
-
-    ;
-
-    private int value;
-
-    MediaConditions(int value)
-    {
-        this.value = value;
-    }
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaMaterials.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaMaterials.java
deleted file mode 100644
index 87c8313a9..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaMaterials.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.twine.tango.dal.enumerations;
-
-import com.twine.tango.core.DescriptionAnnotation;
-
-public enum MediaMaterials
-{
-
-    @DescriptionAnnotation(description = "Nylon")
-    Nylon(1),
-
-    ;
-
-    private int value;
-
-    MediaMaterials(int value)
-    {
-        this.value = value;
-    }
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaPurposes.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaPurposes.java
deleted file mode 100644
index ac68e56df..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaPurposes.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.twine.tango.dal.enumerations;
-
-import com.twine.tango.core.DescriptionAnnotation;
-
-public enum MediaPurposes
-{
-
-    @DescriptionAnnotation(description = "Embroidery")
-    Embroidery(1),
-
-    ;
-
-    private int value;
-
-    MediaPurposes(int value)
-    {
-        this.value = value;
-    }
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MidTankTypes.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MidTankTypes.java
deleted file mode 100644
index a1122db40..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MidTankTypes.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.twine.tango.dal.enumerations;
-
-import com.twine.tango.core.DescriptionAnnotation;
-
-public enum MidTankTypes
-{
-
-    @DescriptionAnnotation(description = "Liter Tank 2")
-    LiterTank2(1),
-
-    ;
-
-    private int value;
-
-    MidTankTypes(int value)
-    {
-        this.value = value;
-    }
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Permissions.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Permissions.java
deleted file mode 100644
index 5a5ef1f06..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Permissions.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.twine.tango.dal.enumerations;
-
-import com.twine.tango.core.DescriptionAnnotation;
-
-public enum Permissions
-{
-
-    @DescriptionAnnotation(description = "Allows loading the technician module in Machine Studio")
-    RunTechnicianModule(0),
-
-    @DescriptionAnnotation(description = "Allows loading the developer module in Machine Studio")
-    RunDeveloperModule(1),
-
-    @DescriptionAnnotation(description = "Allows loading the database module in Machine Studio")
-    RunDataBaseModule(2),
-
-    @DescriptionAnnotation(description = "Allows loading the synchronization module in machine studio")
-    RunSynchronizationModule(3),
-
-    @DescriptionAnnotation(description = "Allows loading the machine designer module in Machine Studio")
-    RunMachineDesignerModule(4),
-
-    @DescriptionAnnotation(description = "Allows loading the data capture module in Machine Studio")
-    RunDataCaptureModule(5),
-
-    @DescriptionAnnotation(description = "Allows the execution of Machine Studio")
-    RunMachineStudio(6),
-
-    @DescriptionAnnotation(description = "Allows publishing of new Machine Studio release version to the Machine Studio Service.")
-    PublishMachineStudioVersion(7),
-
-    @DescriptionAnnotation(description = "Allows loading the stubs module in machine studio")
-    RunStubsModule(8),
-
-    @DescriptionAnnotation(description = "Allows loading the ColorLab module in Machine Studio")
-    RunColorLabModule(9),
-
-    @DescriptionAnnotation(description = "Allows loading the Users & Roles module in machine studio")
-    RunUsersAndRolesModule(10),
-
-    ;
-
-    private int value;
-
-    Permissions(int value)
-    {
-        this.value = value;
-    }
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Rmls.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Rmls.java
deleted file mode 100644
index ea256b2bd..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Rmls.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.twine.tango.dal.enumerations;
-
-import com.twine.tango.core.DescriptionAnnotation;
-
-public enum Rmls
-{
-
-    @DescriptionAnnotation(description = "RML 2")
-    RML2(0),
-
-    @DescriptionAnnotation(description = "RML 1")
-    RML1(0),
-
-    ;
-
-    private int value;
-
-    Rmls(int value)
-    {
-        this.value = value;
-    }
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Roles.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Roles.java
deleted file mode 100644
index 3d0566347..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Roles.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.twine.tango.dal.enumerations;
-
-import com.twine.tango.core.DescriptionAnnotation;
-
-public enum Roles
-{
-
-    @DescriptionAnnotation(description = "User with standard permissions")
-    User(0),
-
-    @DescriptionAnnotation(description = "Twine administrator")
-    Administrator(1),
-
-    @DescriptionAnnotation(description = "Twine technician")
-    Technician(2),
-
-    @DescriptionAnnotation(description = "Twine Research and development")
-    MachineDeveloper(3),
-
-    @DescriptionAnnotation(description = "Publish new Machine Studio Versions")
-    MachineStudioPublisher(4),
-
-    @DescriptionAnnotation(description = "Machine Studio Software Developer")
-    MachineStudioDeveloper(5),
-
-    @DescriptionAnnotation(description = "Twine Software Developer")
-    SoftwareDeveloper(6),
-
-    @DescriptionAnnotation(description = "Manage organizations users and roles")
-    UsersAndRolesManager(7),
-
-    @DescriptionAnnotation(description = "Color adjustment & calibration algorithms developer ")
-    ColorScientist(8),
-
-    ;
-
-    private int value;
-
-    Roles(int value)
-    {
-        this.value = value;
-    }
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/SpoolTypes.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/SpoolTypes.java
deleted file mode 100644
index 93711f341..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/SpoolTypes.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.twine.tango.dal.enumerations;
-
-import com.twine.tango.core.DescriptionAnnotation;
-
-public enum SpoolTypes
-{
-
-    @DescriptionAnnotation(description = "Standard Spool")
-    StandardSpool(0),
-
-    ;
-
-    private int value;
-
-    SpoolTypes(int value)
-    {
-        this.value = value;
-    }
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechControllers.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechControllers.java
deleted file mode 100644
index f7ebc29be..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechControllers.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.twine.tango.dal.enumerations;
-
-import com.twine.tango.core.DescriptionAnnotation;
-
-public enum TechControllers
-{
-
-    @DescriptionAnnotation(description = "Heater 2 Temperature")
-    Heater2Temp(1),
-
-    @DescriptionAnnotation(description = "Heater 1 Temperature")
-    Heater1Temp(0),
-
-    ;
-
-    private int value;
-
-    TechControllers(int value)
-    {
-        this.value = value;
-    }
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechDispensers.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechDispensers.java
deleted file mode 100644
index 14b6464d9..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechDispensers.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.twine.tango.dal.enumerations;
-
-import com.twine.tango.core.DescriptionAnnotation;
-
-public enum TechDispensers
-{
-
-    @DescriptionAnnotation(description = "Dispenser 1")
-    Dispenser1(0),
-
-    @DescriptionAnnotation(description = "Dispenser 2")
-    Dispenser2(1),
-
-    ;
-
-    private int value;
-
-    TechDispensers(int value)
-    {
-        this.value = value;
-    }
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechIos.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechIos.java
deleted file mode 100644
index f228b1cbd..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechIos.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.twine.tango.dal.enumerations;
-
-import com.twine.tango.core.DescriptionAnnotation;
-
-public enum TechIos
-{
-
-    @DescriptionAnnotation(description = "Digital Out 1")
-    PIN0(0),
-
-    @DescriptionAnnotation(description = "Digital Out 2")
-    PIN1(1),
-
-    @DescriptionAnnotation(description = "Digital In 3")
-    PIN2(2),
-
-    ;
-
-    private int value;
-
-    TechIos(int value)
-    {
-        this.value = value;
-    }
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechMonitors.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechMonitors.java
deleted file mode 100644
index b5279426e..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechMonitors.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.twine.tango.dal.enumerations;
-
-import com.twine.tango.core.DescriptionAnnotation;
-
-public enum TechMonitors
-{
-
-    @DescriptionAnnotation(description = "Chiller Temperature")
-    ChillerTemperature(27),
-
-    @DescriptionAnnotation(description = "Head Zone 3")
-    HeadZone3Temperature(12),
-
-    @DescriptionAnnotation(description = "Dispensers Motors")
-    DispensersMotorsFrequency(21),
-
-    @DescriptionAnnotation(description = "Dancer 2")
-    Dancer2Angle(1),
-
-    @DescriptionAnnotation(description = "Dispenser 2 Motor Frequency")
-    Dispenser2MotorFrequency(29),
-
-    @DescriptionAnnotation(description = "Dispenser 7 Motor Frequency")
-    Dispenser7MotorFrequency(34),
-
-    @DescriptionAnnotation(description = "Dispenser 8 Motor Frequency")
-    Dispenser8MotorFrequency(35),
-
-    @DescriptionAnnotation(description = "Dispenser 6 Motor Frequency")
-    Dispenser6MotorFrequency(33),
-
-    @DescriptionAnnotation(description = "Dispenser 5 Motor Frequency")
-    Dispenser5MotorFrequency(32),
-
-    @DescriptionAnnotation(description = "Dryer Zone 3")
-    DryerZone3Temperature(18),
-
-    @DescriptionAnnotation(description = "Winder Motor")
-    WinderMotor(6),
-
-    @DescriptionAnnotation(description = "Dispensers Angular Encoders")
-    DispensersAngularEncoders(22),
-
-    @DescriptionAnnotation(description = "Filter Delta Pressure")
-    FilterDeltaPressure(26),
-
-    @DescriptionAnnotation(description = "Puller Tension")
-    PullerTension(15),
-
-    @DescriptionAnnotation(description = "Dispenser 1 Motor Frequency")
-    Dispenser1MotorFrequency(28),
-
-    @DescriptionAnnotation(description = "Feeder Tension")
-    FeederTension(14),
-
-    @DescriptionAnnotation(description = "Dryer Motor")
-    DryerMotor(4),
-
-    @DescriptionAnnotation(description = "Dryer Air Flow")
-    DryerAirFlow(19),
-
-    @DescriptionAnnotation(description = "Feeder Motor")
-    FeederMotorFrequency(3),
-
-    @DescriptionAnnotation(description = "Mixer")
-    MixerTemperature(9),
-
-    @DescriptionAnnotation(description = "Screw Motor")
-    ScrewMotor(7),
-
-    @DescriptionAnnotation(description = "Thread Speed")
-    ThreadSpeed(8),
-
-    @DescriptionAnnotation(description = "Head Zone 1")
-    HeadZone1Temperature(10),
-
-    @DescriptionAnnotation(description = "Dispenser 3 Motor Frequency")
-    Dispenser3MotorFrequency(30),
-
-    @DescriptionAnnotation(description = "Dryer Zone 1")
-    DryerZone1Temperature(16),
-
-    @DescriptionAnnotation(description = "Dancer 1")
-    Dancer1Angle(0),
-
-    @DescriptionAnnotation(description = "Dryer Zone 2")
-    DryerZone2Temperature(17),
-
-    @DescriptionAnnotation(description = "Dispensers Pressure")
-    DispensersPressure(24),
-
-    @DescriptionAnnotation(description = "Dancer 3")
-    Dancer3Angle(2),
-
-    @DescriptionAnnotation(description = "Head Zone 2")
-    HeadZone2Temperature(11),
-
-    @DescriptionAnnotation(description = "Mid Tank Pressure")
-    MidTankPressure(25),
-
-    @DescriptionAnnotation(description = "Dispenser 4 Motor Frequency")
-    Dispenser4MotorFrequency(31),
-
-    @DescriptionAnnotation(description = "Winder Tension")
-    WinderTension(20),
-
-    @DescriptionAnnotation(description = "Dispensers Linear Positions")
-    DispensersLinearPositions(23),
-
-    @DescriptionAnnotation(description = "Poller Motor")
-    PollerMotor(5),
-
-    @DescriptionAnnotation(description = "Head Air Flow")
-    HeadAirFlow(13),
-
-    ;
-
-    private int value;
-
-    TechMonitors(int value)
-    {
-        this.value = value;
-    }
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechMotors.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechMotors.java
deleted file mode 100644
index 128561d53..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechMotors.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.twine.tango.dal.enumerations;
-
-import com.twine.tango.core.DescriptionAnnotation;
-
-public enum TechMotors
-{
-
-    @DescriptionAnnotation(description = "Dancer 2 Motor")
-    Dancer2Motor(2),
-
-    @DescriptionAnnotation(description = "Dancer 1 Motor")
-    Dancer1Motor(1),
-
-    @DescriptionAnnotation(description = "Dispenser 1 Motor")
-    Dispenser1Motor(0),
-
-    ;
-
-    private int value;
-
-    TechMotors(int value)
-    {
-        this.value = value;
-    }
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechValves.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechValves.java
deleted file mode 100644
index 7ef2fe78f..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechValves.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.twine.tango.dal.enumerations;
-
-import com.twine.tango.core.DescriptionAnnotation;
-
-public enum TechValves
-{
-    ;
-
-    private int value;
-
-    TechValves(int value)
-    {
-        this.value = value;
-    }
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/WindingMethods.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/WindingMethods.java
deleted file mode 100644
index b6c322759..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/WindingMethods.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.twine.tango.dal.enumerations;
-
-import com.twine.tango.core.DescriptionAnnotation;
-
-public enum WindingMethods
-{
-
-    @DescriptionAnnotation(description = "Embroidery Winding")
-    Embroidery(0),
-
-    @DescriptionAnnotation(description = "Calibration Winding")
-    Calibration(1),
-
-    ;
-
-    private int value;
-
-    WindingMethods(int value)
-    {
-        this.value = value;
-    }
-}