diff --git a/cli/name.info b/cli/name.info
new file mode 100644
index 0000000..a08451c
--- /dev/null
+++ b/cli/name.info
@@ -0,0 +1 @@
+Image-Tools-CLI
diff --git a/cli/pom.xml b/cli/pom.xml
index 3cb7381..dd229cc 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -70,7 +70,7 @@
true
lib/
- com.sothr.imagetools.AppCLI
+ com.sothr.imagetools.cli.AppCLI
diff --git a/cli/src/main/java/com/sothr/imagetools/AppCLI.java b/cli/src/main/java/com/sothr/imagetools/cli/AppCLI.java
similarity index 96%
rename from cli/src/main/java/com/sothr/imagetools/AppCLI.java
rename to cli/src/main/java/com/sothr/imagetools/cli/AppCLI.java
index 7c63604..f3ec666 100644
--- a/cli/src/main/java/com/sothr/imagetools/AppCLI.java
+++ b/cli/src/main/java/com/sothr/imagetools/cli/AppCLI.java
@@ -1,12 +1,13 @@
-package com.sothr.imagetools;
+package com.sothr.imagetools.cli;
import akka.actor.ActorRef;
import akka.actor.ActorSystem;
import akka.actor.Props;
+import com.sothr.imagetools.engine.AppConfig;
import com.sothr.imagetools.engine.CLIEngineListener;
import com.sothr.imagetools.engine.ConcurrentEngine;
import com.sothr.imagetools.engine.Engine;
-import com.sothr.imagetools.image.SimilarImages;
+import com.sothr.imagetools.engine.image.SimilarImages;
import org.apache.commons.cli.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/cli/version.info b/cli/version.info
new file mode 100644
index 0000000..2f32a90
--- /dev/null
+++ b/cli/version.info
@@ -0,0 +1 @@
+0.1.1-DEV-13-661ba6d
diff --git a/engine/src/main/java/com/sothr/imagetools/AppConfig.java b/engine/src/main/java/com/sothr/imagetools/engine/AppConfig.java
similarity index 95%
rename from engine/src/main/java/com/sothr/imagetools/AppConfig.java
rename to engine/src/main/java/com/sothr/imagetools/engine/AppConfig.java
index be8ddf6..a378001 100644
--- a/engine/src/main/java/com/sothr/imagetools/AppConfig.java
+++ b/engine/src/main/java/com/sothr/imagetools/engine/AppConfig.java
@@ -1,4 +1,4 @@
-package com.sothr.imagetools;
+package com.sothr.imagetools.engine;
import akka.actor.ActorSystem;
import ch.qos.logback.classic.Logger;
@@ -6,9 +6,9 @@ import ch.qos.logback.classic.LoggerContext;
import ch.qos.logback.classic.joran.JoranConfigurator;
import ch.qos.logback.core.joran.spi.JoranException;
import ch.qos.logback.core.util.StatusPrinter;
-import com.sothr.imagetools.dao.HibernateUtil;
-import com.sothr.imagetools.util.PropertiesService;
-import com.sothr.imagetools.util.ResourceLoader;
+import com.sothr.imagetools.engine.dao.HibernateUtil;
+import com.sothr.imagetools.engine.util.PropertiesService;
+import com.sothr.imagetools.engine.util.ResourceLoader;
import javafx.stage.Stage;
import net.sf.ehcache.CacheManager;
import org.slf4j.LoggerFactory;
diff --git a/engine/src/main/java/com/sothr/imagetools/errors/ImageToolsException.java b/engine/src/main/java/com/sothr/imagetools/engine/errors/ImageToolsException.java
similarity index 89%
rename from engine/src/main/java/com/sothr/imagetools/errors/ImageToolsException.java
rename to engine/src/main/java/com/sothr/imagetools/engine/errors/ImageToolsException.java
index e7bb3d1..5f2bde1 100644
--- a/engine/src/main/java/com/sothr/imagetools/errors/ImageToolsException.java
+++ b/engine/src/main/java/com/sothr/imagetools/engine/errors/ImageToolsException.java
@@ -1,4 +1,4 @@
-package com.sothr.imagetools.errors;
+package com.sothr.imagetools.engine.errors;
/**
* Simple Exception
diff --git a/engine/src/main/java/com/sothr/imagetools/image/ImageType.java b/engine/src/main/java/com/sothr/imagetools/engine/image/ImageType.java
similarity index 59%
rename from engine/src/main/java/com/sothr/imagetools/image/ImageType.java
rename to engine/src/main/java/com/sothr/imagetools/engine/image/ImageType.java
index 70665c1..610514e 100644
--- a/engine/src/main/java/com/sothr/imagetools/image/ImageType.java
+++ b/engine/src/main/java/com/sothr/imagetools/engine/image/ImageType.java
@@ -1,4 +1,4 @@
-package com.sothr.imagetools.image;
+package com.sothr.imagetools.engine.image;
public enum ImageType {
SingleFrameImage, MultiFrameImage
diff --git a/engine/src/main/java/com/sothr/imagetools/util/ResourceLoader.java b/engine/src/main/java/com/sothr/imagetools/engine/util/ResourceLoader.java
similarity index 95%
rename from engine/src/main/java/com/sothr/imagetools/util/ResourceLoader.java
rename to engine/src/main/java/com/sothr/imagetools/engine/util/ResourceLoader.java
index e480d7a..3c132e4 100644
--- a/engine/src/main/java/com/sothr/imagetools/util/ResourceLoader.java
+++ b/engine/src/main/java/com/sothr/imagetools/engine/util/ResourceLoader.java
@@ -1,4 +1,4 @@
-package com.sothr.imagetools.util;
+package com.sothr.imagetools.engine.util;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/engine/src/main/resources/hibernate/Image.hbm.xml b/engine/src/main/resources/hibernate/Image.hbm.xml
index bdc5126..2a19c3e 100644
--- a/engine/src/main/resources/hibernate/Image.hbm.xml
+++ b/engine/src/main/resources/hibernate/Image.hbm.xml
@@ -3,7 +3,7 @@
"-//Hibernate/Hibernate Mapping DTD//EN"
"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
+
This class contains the image hashes and meta data
@@ -11,6 +11,6 @@
-
+
\ No newline at end of file
diff --git a/engine/src/main/resources/hibernate/ImageHash.hbm.xml b/engine/src/main/resources/hibernate/ImageHash.hbm.xml
index 27e862d..880cafe 100644
--- a/engine/src/main/resources/hibernate/ImageHash.hbm.xml
+++ b/engine/src/main/resources/hibernate/ImageHash.hbm.xml
@@ -3,7 +3,7 @@
"-//Hibernate/Hibernate Mapping DTD//EN"
"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
+
This class contains the image hashes
diff --git a/engine/src/main/scala/com/sothr/imagetools/engine/ConcurrentEngine.scala b/engine/src/main/scala/com/sothr/imagetools/engine/ConcurrentEngine.scala
index 35f9322..47626e5 100644
--- a/engine/src/main/scala/com/sothr/imagetools/engine/ConcurrentEngine.scala
+++ b/engine/src/main/scala/com/sothr/imagetools/engine/ConcurrentEngine.scala
@@ -7,9 +7,10 @@ import akka.actor._
import akka.pattern.ask
import akka.routing.{Broadcast, RoundRobinRouter, SmallestMailboxRouter}
import akka.util.Timeout
-import com.sothr.imagetools.hash.HashService
-import com.sothr.imagetools.image.{Image, ImageService, SimilarImages}
-import com.sothr.imagetools.util._
+import com.sothr.imagetools.engine.hash.HashService
+import com.sothr.imagetools.engine.image.{SimilarImages, ImageService, Image}
+import com.sothr.imagetools.image.SimilarImages
+import com.sothr.imagetools.engine.util._
import scala.collection.mutable
import scala.concurrent.Await
diff --git a/engine/src/main/scala/com/sothr/imagetools/engine/Engine.scala b/engine/src/main/scala/com/sothr/imagetools/engine/Engine.scala
index a72fcf5..dd30a7a 100644
--- a/engine/src/main/scala/com/sothr/imagetools/engine/Engine.scala
+++ b/engine/src/main/scala/com/sothr/imagetools/engine/Engine.scala
@@ -3,9 +3,10 @@ package com.sothr.imagetools.engine
import java.io.File
import akka.actor.{Actor, ActorLogging, ActorRef, ActorSystem}
-import com.sothr.imagetools.AppConfig
-import com.sothr.imagetools.image.{Image, ImageFilter, SimilarImages}
-import com.sothr.imagetools.util.DirectoryFilter
+import AppConfig
+import com.sothr.imagetools.engine.image.{SimilarImages, ImageFilter, Image}
+import com.sothr.imagetools.image.SimilarImages
+import com.sothr.imagetools.engine.util.DirectoryFilter
import grizzled.slf4j.Logging
import scala.collection.mutable
diff --git a/engine/src/main/scala/com/sothr/imagetools/engine/SequentialEngine.scala b/engine/src/main/scala/com/sothr/imagetools/engine/SequentialEngine.scala
index 5ea0a3c..3be7aab 100644
--- a/engine/src/main/scala/com/sothr/imagetools/engine/SequentialEngine.scala
+++ b/engine/src/main/scala/com/sothr/imagetools/engine/SequentialEngine.scala
@@ -3,7 +3,8 @@ package com.sothr.imagetools.engine
import java.io.File
import akka.actor.{ActorRef, Props}
-import com.sothr.imagetools.image.{Image, ImageService, SimilarImages}
+import com.sothr.imagetools.engine.image.{SimilarImages, ImageService, Image}
+import com.sothr.imagetools.image.SimilarImages
import grizzled.slf4j.Logging
import scala.collection.mutable
diff --git a/engine/src/main/scala/com/sothr/imagetools/dao/HibernateUtil.scala b/engine/src/main/scala/com/sothr/imagetools/engine/dao/HibernateUtil.scala
similarity index 92%
rename from engine/src/main/scala/com/sothr/imagetools/dao/HibernateUtil.scala
rename to engine/src/main/scala/com/sothr/imagetools/engine/dao/HibernateUtil.scala
index 1997537..0a2db9a 100644
--- a/engine/src/main/scala/com/sothr/imagetools/dao/HibernateUtil.scala
+++ b/engine/src/main/scala/com/sothr/imagetools/engine/dao/HibernateUtil.scala
@@ -1,6 +1,6 @@
-package com.sothr.imagetools.dao
+package com.sothr.imagetools.engine.dao
-import com.sothr.imagetools.util.{PropertiesService, PropertyEnum}
+import com.sothr.imagetools.engine.util.{PropertiesService, PropertyEnum}
import grizzled.slf4j.Logging
import org.hibernate.SessionFactory
import org.hibernate.boot.registry.StandardServiceRegistryBuilder
diff --git a/engine/src/main/scala/com/sothr/imagetools/dao/ImageDAO.scala b/engine/src/main/scala/com/sothr/imagetools/engine/dao/ImageDAO.scala
similarity index 91%
rename from engine/src/main/scala/com/sothr/imagetools/dao/ImageDAO.scala
rename to engine/src/main/scala/com/sothr/imagetools/engine/dao/ImageDAO.scala
index dc1761a..6abaed6 100644
--- a/engine/src/main/scala/com/sothr/imagetools/dao/ImageDAO.scala
+++ b/engine/src/main/scala/com/sothr/imagetools/engine/dao/ImageDAO.scala
@@ -1,6 +1,6 @@
-package com.sothr.imagetools.dao
+package com.sothr.imagetools.engine.dao
-import com.sothr.imagetools.image.Image
+import com.sothr.imagetools.engine.image.Image
import org.hibernate.{Session, SessionFactory}
/**
diff --git a/engine/src/main/scala/com/sothr/imagetools/dto/ImageHashDTO.scala b/engine/src/main/scala/com/sothr/imagetools/engine/dto/ImageHashDTO.scala
similarity index 96%
rename from engine/src/main/scala/com/sothr/imagetools/dto/ImageHashDTO.scala
rename to engine/src/main/scala/com/sothr/imagetools/engine/dto/ImageHashDTO.scala
index b465029..740c225 100644
--- a/engine/src/main/scala/com/sothr/imagetools/dto/ImageHashDTO.scala
+++ b/engine/src/main/scala/com/sothr/imagetools/engine/dto/ImageHashDTO.scala
@@ -1,4 +1,4 @@
-package com.sothr.imagetools.dto
+package com.sothr.imagetools.engine.dto
import javax.persistence._
diff --git a/engine/src/main/scala/com/sothr/imagetools/hash/AHash.scala b/engine/src/main/scala/com/sothr/imagetools/engine/hash/AHash.scala
similarity index 96%
rename from engine/src/main/scala/com/sothr/imagetools/hash/AHash.scala
rename to engine/src/main/scala/com/sothr/imagetools/engine/hash/AHash.scala
index 2502cc6..97b255a 100644
--- a/engine/src/main/scala/com/sothr/imagetools/hash/AHash.scala
+++ b/engine/src/main/scala/com/sothr/imagetools/engine/hash/AHash.scala
@@ -1,4 +1,4 @@
-package com.sothr.imagetools.hash
+package com.sothr.imagetools.engine.hash
import grizzled.slf4j.Logging
diff --git a/engine/src/main/scala/com/sothr/imagetools/hash/DHash.scala b/engine/src/main/scala/com/sothr/imagetools/engine/hash/DHash.scala
similarity index 97%
rename from engine/src/main/scala/com/sothr/imagetools/hash/DHash.scala
rename to engine/src/main/scala/com/sothr/imagetools/engine/hash/DHash.scala
index 2a0c595..0eebb88 100644
--- a/engine/src/main/scala/com/sothr/imagetools/hash/DHash.scala
+++ b/engine/src/main/scala/com/sothr/imagetools/engine/hash/DHash.scala
@@ -1,4 +1,4 @@
-package com.sothr.imagetools.hash
+package com.sothr.imagetools.engine.hash
import grizzled.slf4j.Logging
diff --git a/engine/src/main/scala/com/sothr/imagetools/hash/HashService.scala b/engine/src/main/scala/com/sothr/imagetools/engine/hash/HashService.scala
similarity index 97%
rename from engine/src/main/scala/com/sothr/imagetools/hash/HashService.scala
rename to engine/src/main/scala/com/sothr/imagetools/engine/hash/HashService.scala
index b945656..6dcdb21 100644
--- a/engine/src/main/scala/com/sothr/imagetools/hash/HashService.scala
+++ b/engine/src/main/scala/com/sothr/imagetools/engine/hash/HashService.scala
@@ -1,12 +1,12 @@
-package com.sothr.imagetools.hash
+package com.sothr.imagetools.engine.hash
import java.awt.image.BufferedImage
import java.io.{File, FileInputStream}
import javax.imageio.ImageIO
-import com.sothr.imagetools.dto.ImageHashDTO
-import com.sothr.imagetools.image.ImageService
-import com.sothr.imagetools.util.{Hamming, PropertiesService}
+import com.sothr.imagetools.engine.dto.ImageHashDTO
+import com.sothr.imagetools.engine.image.ImageService
+import com.sothr.imagetools.engine.util.{Hamming, PropertiesService}
import grizzled.slf4j.Logging
import org.apache.commons.codec.digest.DigestUtils
import resource._
diff --git a/engine/src/main/scala/com/sothr/imagetools/hash/PHash.scala b/engine/src/main/scala/com/sothr/imagetools/engine/hash/PHash.scala
similarity index 98%
rename from engine/src/main/scala/com/sothr/imagetools/hash/PHash.scala
rename to engine/src/main/scala/com/sothr/imagetools/engine/hash/PHash.scala
index d902ca0..4a2192e 100644
--- a/engine/src/main/scala/com/sothr/imagetools/hash/PHash.scala
+++ b/engine/src/main/scala/com/sothr/imagetools/engine/hash/PHash.scala
@@ -1,4 +1,4 @@
-package com.sothr.imagetools.hash
+package com.sothr.imagetools.engine.hash
import edu.emory.mathcs.jtransforms.dct.FloatDCT_2D
import grizzled.slf4j.Logging
diff --git a/engine/src/main/scala/com/sothr/imagetools/hash/PerceptualHasher.scala b/engine/src/main/scala/com/sothr/imagetools/engine/hash/PerceptualHasher.scala
similarity index 79%
rename from engine/src/main/scala/com/sothr/imagetools/hash/PerceptualHasher.scala
rename to engine/src/main/scala/com/sothr/imagetools/engine/hash/PerceptualHasher.scala
index 08280ea..b375ff7 100644
--- a/engine/src/main/scala/com/sothr/imagetools/hash/PerceptualHasher.scala
+++ b/engine/src/main/scala/com/sothr/imagetools/engine/hash/PerceptualHasher.scala
@@ -1,4 +1,4 @@
-package com.sothr.imagetools.hash
+package com.sothr.imagetools.engine.hash
/**
* Interface for perceptual hashing
diff --git a/engine/src/main/scala/com/sothr/imagetools/image/Image.scala b/engine/src/main/scala/com/sothr/imagetools/engine/image/Image.scala
similarity index 93%
rename from engine/src/main/scala/com/sothr/imagetools/image/Image.scala
rename to engine/src/main/scala/com/sothr/imagetools/engine/image/Image.scala
index 0168fb8..0ab2660 100644
--- a/engine/src/main/scala/com/sothr/imagetools/image/Image.scala
+++ b/engine/src/main/scala/com/sothr/imagetools/engine/image/Image.scala
@@ -1,9 +1,9 @@
-package com.sothr.imagetools.image
+package com.sothr.imagetools.engine.image
import javax.persistence._
-import com.sothr.imagetools.dto.ImageHashDTO
-import com.sothr.imagetools.hash.HashService
+import com.sothr.imagetools.engine.dto.ImageHashDTO
+import com.sothr.imagetools.engine.hash.HashService
import grizzled.slf4j.Logging
@Entity
diff --git a/engine/src/main/scala/com/sothr/imagetools/image/ImageFilter.scala b/engine/src/main/scala/com/sothr/imagetools/engine/image/ImageFilter.scala
similarity index 93%
rename from engine/src/main/scala/com/sothr/imagetools/image/ImageFilter.scala
rename to engine/src/main/scala/com/sothr/imagetools/engine/image/ImageFilter.scala
index f02196e..7269531 100644
--- a/engine/src/main/scala/com/sothr/imagetools/image/ImageFilter.scala
+++ b/engine/src/main/scala/com/sothr/imagetools/engine/image/ImageFilter.scala
@@ -1,4 +1,4 @@
-package com.sothr.imagetools.image
+package com.sothr.imagetools.engine.image
import java.io.{File, FilenameFilter}
diff --git a/engine/src/main/scala/com/sothr/imagetools/image/ImageService.scala b/engine/src/main/scala/com/sothr/imagetools/engine/image/ImageService.scala
similarity index 96%
rename from engine/src/main/scala/com/sothr/imagetools/image/ImageService.scala
rename to engine/src/main/scala/com/sothr/imagetools/engine/image/ImageService.scala
index 8ad7b9d..c1f1b7a 100644
--- a/engine/src/main/scala/com/sothr/imagetools/image/ImageService.scala
+++ b/engine/src/main/scala/com/sothr/imagetools/engine/image/ImageService.scala
@@ -1,13 +1,12 @@
-package com.sothr.imagetools.image
+package com.sothr.imagetools.engine.image
import java.awt.image.{BufferedImage, ColorConvertOp, DataBufferByte}
import java.io.{File, IOException}
import javax.imageio.ImageIO
-
-import com.sothr.imagetools.AppConfig
-import com.sothr.imagetools.dao.ImageDAO
-import com.sothr.imagetools.hash.HashService
-import com.sothr.imagetools.util.{PropertiesService, PropertyEnum}
+import com.sothr.imagetools.engine.AppConfig
+import com.sothr.imagetools.engine.dao.ImageDAO
+import com.sothr.imagetools.engine.hash.HashService
+import com.sothr.imagetools.engine.util.{PropertiesService, PropertyEnum}
import grizzled.slf4j.Logging
import net.coobird.thumbnailator.Thumbnails
import net.sf.ehcache.Element
diff --git a/engine/src/main/scala/com/sothr/imagetools/image/SimilarImages.scala b/engine/src/main/scala/com/sothr/imagetools/engine/image/SimilarImages.scala
similarity index 95%
rename from engine/src/main/scala/com/sothr/imagetools/image/SimilarImages.scala
rename to engine/src/main/scala/com/sothr/imagetools/engine/image/SimilarImages.scala
index 697e2d4..4255820 100644
--- a/engine/src/main/scala/com/sothr/imagetools/image/SimilarImages.scala
+++ b/engine/src/main/scala/com/sothr/imagetools/engine/image/SimilarImages.scala
@@ -1,4 +1,4 @@
-package com.sothr.imagetools.image
+package com.sothr.imagetools.engine.image
import grizzled.slf4j.Logging
diff --git a/engine/src/main/scala/com/sothr/imagetools/util/DirectoryFilter.scala b/engine/src/main/scala/com/sothr/imagetools/engine/util/DirectoryFilter.scala
similarity index 85%
rename from engine/src/main/scala/com/sothr/imagetools/util/DirectoryFilter.scala
rename to engine/src/main/scala/com/sothr/imagetools/engine/util/DirectoryFilter.scala
index 9d191c5..66e25fd 100644
--- a/engine/src/main/scala/com/sothr/imagetools/util/DirectoryFilter.scala
+++ b/engine/src/main/scala/com/sothr/imagetools/engine/util/DirectoryFilter.scala
@@ -1,4 +1,4 @@
-package com.sothr.imagetools.util
+package com.sothr.imagetools.engine.util
import java.io.{File, FilenameFilter}
diff --git a/engine/src/main/scala/com/sothr/imagetools/util/Hamming.scala b/engine/src/main/scala/com/sothr/imagetools/engine/util/Hamming.scala
similarity index 89%
rename from engine/src/main/scala/com/sothr/imagetools/util/Hamming.scala
rename to engine/src/main/scala/com/sothr/imagetools/engine/util/Hamming.scala
index aa6dac6..466ed51 100644
--- a/engine/src/main/scala/com/sothr/imagetools/util/Hamming.scala
+++ b/engine/src/main/scala/com/sothr/imagetools/engine/util/Hamming.scala
@@ -1,18 +1,18 @@
-package com.sothr.imagetools.util
-
-object Hamming {
-
- /**
- * Calculate the hamming distance between two longs
- *
- * @param hash1 The first hash to compare
- * @param hash2 The second hash to compare
- * @return
- */
- def getDistance(hash1: Long, hash2: Long): Int = {
- //The XOR of hash1 and hash2 is converted to a binary string
- //then the number of '1's is counted. This is the hamming distance
- (hash1 ^ hash2).toBinaryString.count(_ == '1')
- }
-
+package com.sothr.imagetools.engine.util
+
+object Hamming {
+
+ /**
+ * Calculate the hamming distance between two longs
+ *
+ * @param hash1 The first hash to compare
+ * @param hash2 The second hash to compare
+ * @return
+ */
+ def getDistance(hash1: Long, hash2: Long): Int = {
+ //The XOR of hash1 and hash2 is converted to a binary string
+ //then the number of '1's is counted. This is the hamming distance
+ (hash1 ^ hash2).toBinaryString.count(_ == '1')
+ }
+
}
\ No newline at end of file
diff --git a/engine/src/main/scala/com/sothr/imagetools/util/PropertiesService.scala b/engine/src/main/scala/com/sothr/imagetools/engine/util/PropertiesService.scala
similarity index 98%
rename from engine/src/main/scala/com/sothr/imagetools/util/PropertiesService.scala
rename to engine/src/main/scala/com/sothr/imagetools/engine/util/PropertiesService.scala
index c55f3e7..92f13fd 100644
--- a/engine/src/main/scala/com/sothr/imagetools/util/PropertiesService.scala
+++ b/engine/src/main/scala/com/sothr/imagetools/engine/util/PropertiesService.scala
@@ -1,4 +1,4 @@
-package com.sothr.imagetools.util
+package com.sothr.imagetools.engine.util
import java.io.{File, FileOutputStream, PrintStream}
import java.util.Properties
diff --git a/engine/src/main/scala/com/sothr/imagetools/util/PropertyEnum.scala b/engine/src/main/scala/com/sothr/imagetools/engine/util/PropertyEnum.scala
similarity index 97%
rename from engine/src/main/scala/com/sothr/imagetools/util/PropertyEnum.scala
rename to engine/src/main/scala/com/sothr/imagetools/engine/util/PropertyEnum.scala
index ceff64c..ef53c34 100644
--- a/engine/src/main/scala/com/sothr/imagetools/util/PropertyEnum.scala
+++ b/engine/src/main/scala/com/sothr/imagetools/engine/util/PropertyEnum.scala
@@ -1,4 +1,4 @@
-package com.sothr.imagetools.util
+package com.sothr.imagetools.engine.util
object PropertyEnum extends Enumeration {
type PropertiesEnum = Value
diff --git a/engine/src/main/scala/com/sothr/imagetools/util/Timing.scala b/engine/src/main/scala/com/sothr/imagetools/engine/util/Timing.scala
similarity index 94%
rename from engine/src/main/scala/com/sothr/imagetools/util/Timing.scala
rename to engine/src/main/scala/com/sothr/imagetools/engine/util/Timing.scala
index a54d00c..50eafe1 100644
--- a/engine/src/main/scala/com/sothr/imagetools/util/Timing.scala
+++ b/engine/src/main/scala/com/sothr/imagetools/engine/util/Timing.scala
@@ -1,4 +1,4 @@
-package com.sothr.imagetools.util
+package com.sothr.imagetools.engine.util
import grizzled.slf4j.Logging
diff --git a/engine/src/main/scala/com/sothr/imagetools/util/Version.scala b/engine/src/main/scala/com/sothr/imagetools/engine/util/Version.scala
similarity index 98%
rename from engine/src/main/scala/com/sothr/imagetools/util/Version.scala
rename to engine/src/main/scala/com/sothr/imagetools/engine/util/Version.scala
index 7e5ccf6..1bc9745 100644
--- a/engine/src/main/scala/com/sothr/imagetools/util/Version.scala
+++ b/engine/src/main/scala/com/sothr/imagetools/engine/util/Version.scala
@@ -1,4 +1,4 @@
-package com.sothr.imagetools.util
+package com.sothr.imagetools.engine.util
import grizzled.slf4j.Logging
diff --git a/engine/src/test/java/com/sothr/imagetools/AppTest.java b/engine/src/test/java/com/sothr/imagetools/engine/AppTest.java
similarity index 94%
rename from engine/src/test/java/com/sothr/imagetools/AppTest.java
rename to engine/src/test/java/com/sothr/imagetools/engine/AppTest.java
index 19e3b9c..5906105 100644
--- a/engine/src/test/java/com/sothr/imagetools/AppTest.java
+++ b/engine/src/test/java/com/sothr/imagetools/engine/AppTest.java
@@ -1,4 +1,4 @@
-package com.sothr.imagetools;
+package com.sothr.imagetools.engine;
import junit.framework.Test;
import junit.framework.TestCase;
diff --git a/engine/src/test/resources/hibernate/Image.hbm.xml b/engine/src/test/resources/hibernate/Image.hbm.xml
index bdc5126..2a19c3e 100644
--- a/engine/src/test/resources/hibernate/Image.hbm.xml
+++ b/engine/src/test/resources/hibernate/Image.hbm.xml
@@ -3,7 +3,7 @@
"-//Hibernate/Hibernate Mapping DTD//EN"
"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
+
This class contains the image hashes and meta data
@@ -11,6 +11,6 @@
-
+
\ No newline at end of file
diff --git a/engine/src/test/resources/hibernate/ImageHash.hbm.xml b/engine/src/test/resources/hibernate/ImageHash.hbm.xml
index 27e862d..880cafe 100644
--- a/engine/src/test/resources/hibernate/ImageHash.hbm.xml
+++ b/engine/src/test/resources/hibernate/ImageHash.hbm.xml
@@ -3,7 +3,7 @@
"-//Hibernate/Hibernate Mapping DTD//EN"
"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
+
This class contains the image hashes
diff --git a/engine/src/test/scala/com/sothr/imagetools/BaseTest.scala b/engine/src/test/scala/com/sothr/imagetools/engine/BaseTest.scala
similarity index 79%
rename from engine/src/test/scala/com/sothr/imagetools/BaseTest.scala
rename to engine/src/test/scala/com/sothr/imagetools/engine/BaseTest.scala
index c2ce6f8..aabfaff 100644
--- a/engine/src/test/scala/com/sothr/imagetools/BaseTest.scala
+++ b/engine/src/test/scala/com/sothr/imagetools/engine/BaseTest.scala
@@ -1,6 +1,6 @@
-package com.sothr.imagetools
+package com.sothr.imagetools.engine
-import com.sothr.imagetools.util.Timing
+import com.sothr.imagetools.engine.util.Timing
import grizzled.slf4j.Logging
import org.scalatest.{BeforeAndAfter, FunSuite, Inside, Inspectors, Matchers, OptionValues}
diff --git a/engine/src/test/scala/com/sothr/imagetools/EngineTest.scala b/engine/src/test/scala/com/sothr/imagetools/engine/EngineTest.scala
similarity index 91%
rename from engine/src/test/scala/com/sothr/imagetools/EngineTest.scala
rename to engine/src/test/scala/com/sothr/imagetools/engine/EngineTest.scala
index c4586f1..8b6451d 100644
--- a/engine/src/test/scala/com/sothr/imagetools/EngineTest.scala
+++ b/engine/src/test/scala/com/sothr/imagetools/engine/EngineTest.scala
@@ -1,6 +1,4 @@
-package com.sothr.imagetools
-
-import com.sothr.imagetools.engine.{ConcurrentEngine, Engine, SequentialEngine}
+package com.sothr.imagetools.engine
/**
* Basic Test of the engines
diff --git a/engine/src/test/scala/com/sothr/imagetools/ScalaAppTest.scala b/engine/src/test/scala/com/sothr/imagetools/engine/ScalaAppTest.scala
similarity index 77%
rename from engine/src/test/scala/com/sothr/imagetools/ScalaAppTest.scala
rename to engine/src/test/scala/com/sothr/imagetools/engine/ScalaAppTest.scala
index 953f0c1..404417e 100644
--- a/engine/src/test/scala/com/sothr/imagetools/ScalaAppTest.scala
+++ b/engine/src/test/scala/com/sothr/imagetools/engine/ScalaAppTest.scala
@@ -1,4 +1,4 @@
-package com.sothr.imagetools
+package com.sothr.imagetools.engine
class ScalaAppTest extends BaseTest {
diff --git a/engine/src/test/scala/com/sothr/imagetools/TestParams.scala b/engine/src/test/scala/com/sothr/imagetools/engine/TestParams.scala
similarity index 83%
rename from engine/src/test/scala/com/sothr/imagetools/TestParams.scala
rename to engine/src/test/scala/com/sothr/imagetools/engine/TestParams.scala
index 599ba47..235df0d 100644
--- a/engine/src/test/scala/com/sothr/imagetools/TestParams.scala
+++ b/engine/src/test/scala/com/sothr/imagetools/engine/TestParams.scala
@@ -1,4 +1,4 @@
-package com.sothr.imagetools
+package com.sothr.imagetools.engine
object TestParams {
val LargeSampleImage1 = "sample/sample_01_large.jpg"
diff --git a/engine/src/test/scala/com/sothr/imagetools/hash/HashServiceTest.scala b/engine/src/test/scala/com/sothr/imagetools/engine/hash/HashServiceTest.scala
similarity index 98%
rename from engine/src/test/scala/com/sothr/imagetools/hash/HashServiceTest.scala
rename to engine/src/test/scala/com/sothr/imagetools/engine/hash/HashServiceTest.scala
index f605be8..ed7fef7 100644
--- a/engine/src/test/scala/com/sothr/imagetools/hash/HashServiceTest.scala
+++ b/engine/src/test/scala/com/sothr/imagetools/engine/hash/HashServiceTest.scala
@@ -1,10 +1,11 @@
-package com.sothr.imagetools.hash
+package com.sothr.imagetools.engine.hash
import java.io.File
import javax.imageio.ImageIO
-import com.sothr.imagetools.dto.ImageHashDTO
-import com.sothr.imagetools.{AppConfig, BaseTest, TestParams}
+import com.sothr.imagetools.engine.{TestParams, BaseTest, AppConfig}
+import com.sothr.imagetools.engine.dto.ImageHashDTO
+import com.sothr.imagetools.TestParams
import net.sf.ehcache.Element
import scala.collection.mutable
diff --git a/engine/src/test/scala/com/sothr/imagetools/image/ImageFilterTest.scala b/engine/src/test/scala/com/sothr/imagetools/engine/image/ImageFilterTest.scala
similarity index 92%
rename from engine/src/test/scala/com/sothr/imagetools/image/ImageFilterTest.scala
rename to engine/src/test/scala/com/sothr/imagetools/engine/image/ImageFilterTest.scala
index 83b10d1..657808c 100644
--- a/engine/src/test/scala/com/sothr/imagetools/image/ImageFilterTest.scala
+++ b/engine/src/test/scala/com/sothr/imagetools/engine/image/ImageFilterTest.scala
@@ -1,8 +1,8 @@
-package com.sothr.imagetools.image
+package com.sothr.imagetools.engine.image
import java.io.File
-import com.sothr.imagetools.BaseTest
+import com.sothr.imagetools.engine.BaseTest
/**
* Test to make sure that the image filters work
diff --git a/gui/name.info b/gui/name.info
new file mode 100644
index 0000000..1eb70f3
--- /dev/null
+++ b/gui/name.info
@@ -0,0 +1 @@
+Image-Tools-GUI
diff --git a/gui/pom.xml b/gui/pom.xml
index cbcbc8e..508c64f 100644
--- a/gui/pom.xml
+++ b/gui/pom.xml
@@ -74,7 +74,7 @@
true
lib/
- com.sothr.imagetools.App
+ com.sothr.imagetools.ui.App
diff --git a/gui/src/main/java/com/sothr/imagetools/App.java b/gui/src/main/java/com/sothr/imagetools/ui/App.java
similarity index 92%
rename from gui/src/main/java/com/sothr/imagetools/App.java
rename to gui/src/main/java/com/sothr/imagetools/ui/App.java
index 39c4a2c..7958dff 100644
--- a/gui/src/main/java/com/sothr/imagetools/App.java
+++ b/gui/src/main/java/com/sothr/imagetools/ui/App.java
@@ -1,7 +1,8 @@
-package com.sothr.imagetools;
+package com.sothr.imagetools.ui;
-import com.sothr.imagetools.errors.ImageToolsException;
-import com.sothr.imagetools.util.ResourceLoader;
+import com.sothr.imagetools.engine.AppConfig;
+import com.sothr.imagetools.engine.errors.ImageToolsException;
+import com.sothr.imagetools.engine.util.ResourceLoader;
import javafx.application.Application;
import javafx.fxml.FXMLLoader;
import javafx.scene.Parent;
diff --git a/engine/src/main/scala/com/sothr/imagetools/ui/component/ImageTile.scala b/gui/src/main/scala/com/sothr/imagetools/ui/component/ImageTile.scala
similarity index 87%
rename from engine/src/main/scala/com/sothr/imagetools/ui/component/ImageTile.scala
rename to gui/src/main/scala/com/sothr/imagetools/ui/component/ImageTile.scala
index d064106..8dba4dc 100644
--- a/engine/src/main/scala/com/sothr/imagetools/ui/component/ImageTile.scala
+++ b/gui/src/main/scala/com/sothr/imagetools/ui/component/ImageTile.scala
@@ -2,7 +2,7 @@ package com.sothr.imagetools.ui.component
import javafx.scene.layout.VBox
-import com.sothr.imagetools.image.Image
+import com.sothr.imagetools.engine.image.Image
/**
* ImageTile class that is a special VBox
diff --git a/engine/src/main/scala/com/sothr/imagetools/ui/component/ImageTileFactory.scala b/gui/src/main/scala/com/sothr/imagetools/ui/component/ImageTileFactory.scala
similarity index 96%
rename from engine/src/main/scala/com/sothr/imagetools/ui/component/ImageTileFactory.scala
rename to gui/src/main/scala/com/sothr/imagetools/ui/component/ImageTileFactory.scala
index 3dab590..2e66822 100644
--- a/engine/src/main/scala/com/sothr/imagetools/ui/component/ImageTileFactory.scala
+++ b/gui/src/main/scala/com/sothr/imagetools/ui/component/ImageTileFactory.scala
@@ -7,6 +7,7 @@ import javafx.scene.control.{Label, Tooltip}
import javafx.scene.image.{Image, ImageView}
import javafx.scene.input.MouseEvent
+import com.sothr.imagetools.engine.image
import grizzled.slf4j.Logging
import resource._
@@ -17,7 +18,7 @@ import resource._
*/
object ImageTileFactory extends Logging {
- def get(image:com.sothr.imagetools.image.Image):ImageTile = {
+ def get(image:image.Image):ImageTile = {
val imageTile = new ImageTile()
imageTile.setImageData(image)
//set tile size
diff --git a/engine/src/main/scala/com/sothr/imagetools/ui/controller/AppController.scala b/gui/src/main/scala/com/sothr/imagetools/ui/controller/AppController.scala
similarity index 98%
rename from engine/src/main/scala/com/sothr/imagetools/ui/controller/AppController.scala
rename to gui/src/main/scala/com/sothr/imagetools/ui/controller/AppController.scala
index 48a1723..be46d84 100644
--- a/engine/src/main/scala/com/sothr/imagetools/ui/controller/AppController.scala
+++ b/gui/src/main/scala/com/sothr/imagetools/ui/controller/AppController.scala
@@ -12,7 +12,7 @@ import javafx.stage.{DirectoryChooser, Stage, StageStyle}
import com.sothr.imagetools.engine.{ConcurrentEngine, Engine}
import com.sothr.imagetools.ui.component.ImageTileFactory
-import com.sothr.imagetools.util.{PropertiesService, ResourceLoader}
+import com.sothr.imagetools.engine.util.{PropertiesService, ResourceLoader}
import grizzled.slf4j.Logging
import org.markdown4j.Markdown4jProcessor
diff --git a/gui/version.info b/gui/version.info
new file mode 100644
index 0000000..2f32a90
--- /dev/null
+++ b/gui/version.info
@@ -0,0 +1 @@
+0.1.1-DEV-13-661ba6d