diff --git a/pom.xml b/pom.xml
index 3e1003c..46678aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
net.forwardfire.unitxc
- ff-unitxc
+ unitxc
0.0.1-SNAPSHOT
pom
FFUnitXC
@@ -24,7 +24,7 @@
3.0.1
- ff-unitxc-converter
+ unitxc-converter
UTF-8
diff --git a/ff-unitxc-converter/pom.xml b/unitxc-converter/pom.xml
similarity index 89%
rename from ff-unitxc-converter/pom.xml
rename to unitxc-converter/pom.xml
index 66a0658..8ffffa7 100644
--- a/ff-unitxc-converter/pom.xml
+++ b/unitxc-converter/pom.xml
@@ -3,10 +3,10 @@
4.0.0
net.forwardfire.unitxc
- ff-unitxc
+ unitxc
0.0.1-SNAPSHOT
- ff-unitxc-converter
+ unitxc-converter
org.slf4j
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/UnitXCFactory.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/UnitXCFactory.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/UnitXCFactory.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/UnitXCFactory.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/UnitXCManager.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/UnitXCManager.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/UnitXCManager.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/UnitXCManager.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/config/UnitXCConfigManager.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/config/UnitXCConfigManager.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/config/UnitXCConfigManager.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/config/UnitXCConfigManager.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/config/UnitXCConfigModule.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/config/UnitXCConfigModule.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/config/UnitXCConfigModule.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/config/UnitXCConfigModule.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/AbstractUnitXCBuilder.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/AbstractUnitXCBuilder.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/AbstractUnitXCBuilder.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/AbstractUnitXCBuilder.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/AbstractUnitXCGroupBuilder.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/AbstractUnitXCGroupBuilder.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/AbstractUnitXCGroupBuilder.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/AbstractUnitXCGroupBuilder.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/AbstractUnitXCTypeBuilder.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/AbstractUnitXCTypeBuilder.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/AbstractUnitXCTypeBuilder.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/AbstractUnitXCTypeBuilder.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCConfigBuilder.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCConfigBuilder.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCConfigBuilder.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCConfigBuilder.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCConfigModuleBuilder.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCConfigModuleBuilder.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCConfigModuleBuilder.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCConfigModuleBuilder.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCGroupBaseBuilder.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCGroupBaseBuilder.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCGroupBaseBuilder.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCGroupBaseBuilder.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCGroupCompoundExponentBuilder.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCGroupCompoundExponentBuilder.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCGroupCompoundExponentBuilder.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCGroupCompoundExponentBuilder.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCGroupCompoundPairBuilder.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCGroupCompoundPairBuilder.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCGroupCompoundPairBuilder.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCGroupCompoundPairBuilder.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCGroupExtendBuilder.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCGroupExtendBuilder.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCGroupExtendBuilder.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCGroupExtendBuilder.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCGroupJumpBuilder.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCGroupJumpBuilder.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCGroupJumpBuilder.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCGroupJumpBuilder.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCNumberTypeSetting.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCNumberTypeSetting.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCNumberTypeSetting.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCNumberTypeSetting.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCTypeBuilder.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCTypeBuilder.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCTypeBuilder.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCTypeBuilder.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCTypeSIPrefix.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCTypeSIPrefix.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCTypeSIPrefix.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCTypeSIPrefix.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCTypeSIPrefixBuilder.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCTypeSIPrefixBuilder.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCTypeSIPrefixBuilder.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXCTypeSIPrefixBuilder.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXConverterStepBuilder.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXConverterStepBuilder.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXConverterStepBuilder.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/UnitXConverterStepBuilder.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/package-info.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/package-info.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/package-info.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/config/builder/package-info.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/config/package-info.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/config/package-info.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/config/package-info.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/config/package-info.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/converter/UnitXConverter.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/converter/UnitXConverter.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/converter/UnitXConverter.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/converter/UnitXConverter.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/converter/UnitXConverterEngine.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/converter/UnitXConverterEngine.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/converter/UnitXConverterEngine.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/converter/UnitXConverterEngine.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/converter/UnitXConverterParameterValue.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/converter/UnitXConverterParameterValue.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/converter/UnitXConverterParameterValue.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/converter/UnitXConverterParameterValue.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/converter/package-info.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/converter/package-info.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/converter/package-info.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/converter/package-info.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/AbstractUnitXCGroup.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/AbstractUnitXCGroup.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/AbstractUnitXCGroup.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/AbstractUnitXCGroup.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/DefaultUnitXCGroupJump.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/DefaultUnitXCGroupJump.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/DefaultUnitXCGroupJump.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/DefaultUnitXCGroupJump.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/DefaultUnitXCGroupJumpParameter.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/DefaultUnitXCGroupJumpParameter.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/DefaultUnitXCGroupJumpParameter.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/DefaultUnitXCGroupJumpParameter.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/DefaultUnitXCGroupQuantity.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/DefaultUnitXCGroupQuantity.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/DefaultUnitXCGroupQuantity.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/DefaultUnitXCGroupQuantity.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/DefaultUnitXCResourceValue.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/DefaultUnitXCResourceValue.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/DefaultUnitXCResourceValue.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/DefaultUnitXCResourceValue.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/DefaultUnitXCType.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/DefaultUnitXCType.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/DefaultUnitXCType.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/DefaultUnitXCType.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/DefaultUnitXConverterResult.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/DefaultUnitXConverterResult.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/DefaultUnitXConverterResult.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/DefaultUnitXConverterResult.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/DefaultUnitXConverterResultStep.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/DefaultUnitXConverterResultStep.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/DefaultUnitXConverterResultStep.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/DefaultUnitXConverterResultStep.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCConfig.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCConfig.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCConfig.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCConfig.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCGroup.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCGroup.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCGroup.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCGroup.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCGroupBase.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCGroupBase.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCGroupBase.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCGroupBase.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCGroupCompoundExponent.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCGroupCompoundExponent.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCGroupCompoundExponent.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCGroupCompoundExponent.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCGroupCompoundPair.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCGroupCompoundPair.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCGroupCompoundPair.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCGroupCompoundPair.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCGroupJump.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCGroupJump.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCGroupJump.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCGroupJump.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCGroupJumpParameter.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCGroupJumpParameter.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCGroupJumpParameter.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCGroupJumpParameter.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCGroupQuantity.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCGroupQuantity.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCGroupQuantity.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCGroupQuantity.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCGroupSource.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCGroupSource.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCGroupSource.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCGroupSource.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCModule.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCModule.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCModule.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCModule.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCResourceBundle.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCResourceBundle.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCResourceBundle.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCResourceBundle.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCResourceValue.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCResourceValue.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCResourceValue.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCResourceValue.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCRounding.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCRounding.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCRounding.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCRounding.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCType.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCType.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCType.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXCType.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXConverterResult.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXConverterResult.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXConverterResult.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXConverterResult.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXConverterResultStep.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXConverterResultStep.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXConverterResultStep.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/UnitXConverterResultStep.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/package-info.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/package-info.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/package-info.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/package-info.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/AbstractUnitXConverterStep.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/AbstractUnitXConverterStep.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/AbstractUnitXConverterStep.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/AbstractUnitXConverterStep.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/RuleStepCode.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/RuleStepCode.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/RuleStepCode.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/RuleStepCode.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/RuleStepCodePrinter.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/RuleStepCodePrinter.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/RuleStepCodePrinter.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/RuleStepCodePrinter.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/RuleStepCodeStyle.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/RuleStepCodeStyle.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/RuleStepCodeStyle.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/RuleStepCodeStyle.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/UnitXCConverterStepAutoRounding.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/UnitXCConverterStepAutoRounding.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/UnitXCConverterStepAutoRounding.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/UnitXCConverterStepAutoRounding.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/UnitXCConverterStepCondition.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/UnitXCConverterStepCondition.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/UnitXCConverterStepCondition.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/UnitXCConverterStepCondition.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/UnitXCConverterStepConditionEquality.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/UnitXCConverterStepConditionEquality.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/UnitXCConverterStepConditionEquality.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/UnitXCConverterStepConditionEquality.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/UnitXCConverterStepOperation.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/UnitXCConverterStepOperation.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/UnitXCConverterStepOperation.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/UnitXCConverterStepOperation.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/UnitXCConverterStepOperationOperator.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/UnitXCConverterStepOperationOperator.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/UnitXCConverterStepOperationOperator.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/UnitXCConverterStepOperationOperator.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/UnitXCConverterStepPowerOfTen.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/UnitXCConverterStepPowerOfTen.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/UnitXCConverterStepPowerOfTen.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/UnitXCConverterStepPowerOfTen.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/UnitXCConverterStepReference.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/UnitXCConverterStepReference.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/UnitXCConverterStepReference.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/UnitXCConverterStepReference.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/UnitXConverterStep.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/UnitXConverterStep.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/UnitXConverterStep.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/UnitXConverterStep.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/UnitXConverterStepContext.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/UnitXConverterStepContext.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/UnitXConverterStepContext.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/UnitXConverterStepContext.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/package-info.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/package-info.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/package-info.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/package-info.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/value/UnitXConverterStepValueNamedParameter.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/value/UnitXConverterStepValueNamedParameter.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/value/UnitXConverterStepValueNamedParameter.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/value/UnitXConverterStepValueNamedParameter.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/value/UnitXConverterStepValueNamedVariable.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/value/UnitXConverterStepValueNamedVariable.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/value/UnitXConverterStepValueNamedVariable.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/value/UnitXConverterStepValueNamedVariable.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/value/UnitXConverterStepValueRead.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/value/UnitXConverterStepValueRead.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/value/UnitXConverterStepValueRead.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/value/UnitXConverterStepValueRead.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/value/UnitXConverterStepValueReadWrite.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/value/UnitXConverterStepValueReadWrite.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/value/UnitXConverterStepValueReadWrite.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/value/UnitXConverterStepValueReadWrite.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/value/UnitXConverterStepValueReferenceDouble.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/value/UnitXConverterStepValueReferenceDouble.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/value/UnitXConverterStepValueReferenceDouble.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/value/UnitXConverterStepValueReferenceDouble.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/value/UnitXConverterStepValueReferenceDoubleFraction.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/value/UnitXConverterStepValueReferenceDoubleFraction.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/value/UnitXConverterStepValueReferenceDoubleFraction.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/value/UnitXConverterStepValueReferenceDoubleFraction.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/value/UnitXConverterStepValueReferenceInteger.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/value/UnitXConverterStepValueReferenceInteger.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/value/UnitXConverterStepValueReferenceInteger.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/value/UnitXConverterStepValueReferenceInteger.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/value/UnitXConverterStepValueReferenceString.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/value/UnitXConverterStepValueReferenceString.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/value/UnitXConverterStepValueReferenceString.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/value/UnitXConverterStepValueReferenceString.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/value/package-info.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/value/package-info.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/value/package-info.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/model/step/value/package-info.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/UnitXCModuleAmpere.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/module/UnitXCModuleAmpere.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/UnitXCModuleAmpere.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/module/UnitXCModuleAmpere.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/UnitXCModuleCandela.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/module/UnitXCModuleCandela.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/UnitXCModuleCandela.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/module/UnitXCModuleCandela.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/UnitXCModuleKelvin.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/module/UnitXCModuleKelvin.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/UnitXCModuleKelvin.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/module/UnitXCModuleKelvin.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/UnitXCModuleKilogram.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/module/UnitXCModuleKilogram.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/UnitXCModuleKilogram.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/module/UnitXCModuleKilogram.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/UnitXCModuleMetre.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/module/UnitXCModuleMetre.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/UnitXCModuleMetre.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/module/UnitXCModuleMetre.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/UnitXCModuleMole.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/module/UnitXCModuleMole.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/UnitXCModuleMole.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/module/UnitXCModuleMole.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/UnitXCModuleSecond.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/module/UnitXCModuleSecond.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/UnitXCModuleSecond.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/module/UnitXCModuleSecond.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleCubicMetre.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleCubicMetre.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleCubicMetre.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleCubicMetre.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleCubicMetrePerKilogram.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleCubicMetrePerKilogram.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleCubicMetrePerKilogram.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleCubicMetrePerKilogram.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleCubicMetrePerMole.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleCubicMetrePerMole.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleCubicMetrePerMole.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleCubicMetrePerMole.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleCubicMetrePerSecond.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleCubicMetrePerSecond.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleCubicMetrePerSecond.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleCubicMetrePerSecond.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleKilogramPerCubicMetre.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleKilogramPerCubicMetre.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleKilogramPerCubicMetre.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleKilogramPerCubicMetre.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleKilogramPerSquareMetre.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleKilogramPerSquareMetre.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleKilogramPerSquareMetre.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleKilogramPerSquareMetre.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleMetrePerQuarticSecond.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleMetrePerQuarticSecond.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleMetrePerQuarticSecond.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleMetrePerQuarticSecond.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleMetrePerSecond.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleMetrePerSecond.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleMetrePerSecond.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleMetrePerSecond.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleMetrePerSecondCubed.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleMetrePerSecondCubed.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleMetrePerSecondCubed.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleMetrePerSecondCubed.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleMetrePerSecondSquared.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleMetrePerSecondSquared.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleMetrePerSecondSquared.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleMetrePerSecondSquared.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleMolePerCubicMetre.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleMolePerCubicMetre.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleMolePerCubicMetre.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleMolePerCubicMetre.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleNewtonPerSecond.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleNewtonPerSecond.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleNewtonPerSecond.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleNewtonPerSecond.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleSquareMetre.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleSquareMetre.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleSquareMetre.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/UnitXCModuleSquareMetre.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/package-info.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/package-info.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/package-info.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/module/derived/package-info.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/named/UnitXCModuleNewton.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/module/named/UnitXCModuleNewton.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/named/UnitXCModuleNewton.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/module/named/UnitXCModuleNewton.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/named/package-info.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/module/named/package-info.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/named/package-info.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/module/named/package-info.java
diff --git a/ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/package-info.java b/unitxc-converter/src/main/java/net/forwardfire/unitxc/module/package-info.java
similarity index 100%
rename from ff-unitxc-converter/src/main/java/net/forwardfire/unitxc/module/package-info.java
rename to unitxc-converter/src/main/java/net/forwardfire/unitxc/module/package-info.java
diff --git a/ff-unitxc-converter/src/main/resources/net/forwardfire/unitxc/UnitXCBundle.properties b/unitxc-converter/src/main/resources/net/forwardfire/unitxc/UnitXCBundle.properties
similarity index 100%
rename from ff-unitxc-converter/src/main/resources/net/forwardfire/unitxc/UnitXCBundle.properties
rename to unitxc-converter/src/main/resources/net/forwardfire/unitxc/UnitXCBundle.properties
diff --git a/ff-unitxc-converter/src/test/java/net/forwardfire/unitxc/UnitXCAssert.java b/unitxc-converter/src/test/java/net/forwardfire/unitxc/UnitXCAssert.java
similarity index 100%
rename from ff-unitxc-converter/src/test/java/net/forwardfire/unitxc/UnitXCAssert.java
rename to unitxc-converter/src/test/java/net/forwardfire/unitxc/UnitXCAssert.java
diff --git a/ff-unitxc-converter/src/test/java/net/forwardfire/unitxc/UnitXCConverterStepTest.java b/unitxc-converter/src/test/java/net/forwardfire/unitxc/UnitXCConverterStepTest.java
similarity index 100%
rename from ff-unitxc-converter/src/test/java/net/forwardfire/unitxc/UnitXCConverterStepTest.java
rename to unitxc-converter/src/test/java/net/forwardfire/unitxc/UnitXCConverterStepTest.java
diff --git a/ff-unitxc-converter/src/test/java/net/forwardfire/unitxc/UnitXCFactoryTest.java b/unitxc-converter/src/test/java/net/forwardfire/unitxc/UnitXCFactoryTest.java
similarity index 100%
rename from ff-unitxc-converter/src/test/java/net/forwardfire/unitxc/UnitXCFactoryTest.java
rename to unitxc-converter/src/test/java/net/forwardfire/unitxc/UnitXCFactoryTest.java
diff --git a/ff-unitxc-converter/src/test/java/net/forwardfire/unitxc/UnitXCManagerTest.java b/unitxc-converter/src/test/java/net/forwardfire/unitxc/UnitXCManagerTest.java
similarity index 100%
rename from ff-unitxc-converter/src/test/java/net/forwardfire/unitxc/UnitXCManagerTest.java
rename to unitxc-converter/src/test/java/net/forwardfire/unitxc/UnitXCManagerTest.java
diff --git a/ff-unitxc-converter/src/test/java/net/forwardfire/unitxc/module/UnitXCModuleAreaTest.java b/unitxc-converter/src/test/java/net/forwardfire/unitxc/module/UnitXCModuleAreaTest.java
similarity index 100%
rename from ff-unitxc-converter/src/test/java/net/forwardfire/unitxc/module/UnitXCModuleAreaTest.java
rename to unitxc-converter/src/test/java/net/forwardfire/unitxc/module/UnitXCModuleAreaTest.java
diff --git a/ff-unitxc-converter/src/test/java/net/forwardfire/unitxc/module/UnitXCModuleLengthTest.java b/unitxc-converter/src/test/java/net/forwardfire/unitxc/module/UnitXCModuleLengthTest.java
similarity index 100%
rename from ff-unitxc-converter/src/test/java/net/forwardfire/unitxc/module/UnitXCModuleLengthTest.java
rename to unitxc-converter/src/test/java/net/forwardfire/unitxc/module/UnitXCModuleLengthTest.java
diff --git a/ff-unitxc-converter/src/test/java/net/forwardfire/unitxc/module/UnitXCModuleTemperatureTest.java b/unitxc-converter/src/test/java/net/forwardfire/unitxc/module/UnitXCModuleTemperatureTest.java
similarity index 100%
rename from ff-unitxc-converter/src/test/java/net/forwardfire/unitxc/module/UnitXCModuleTemperatureTest.java
rename to unitxc-converter/src/test/java/net/forwardfire/unitxc/module/UnitXCModuleTemperatureTest.java
diff --git a/ff-unitxc-converter/src/test/java/net/forwardfire/unitxc/module/UnitXCModuleTimeTest.java b/unitxc-converter/src/test/java/net/forwardfire/unitxc/module/UnitXCModuleTimeTest.java
similarity index 100%
rename from ff-unitxc-converter/src/test/java/net/forwardfire/unitxc/module/UnitXCModuleTimeTest.java
rename to unitxc-converter/src/test/java/net/forwardfire/unitxc/module/UnitXCModuleTimeTest.java
diff --git a/ff-unitxc-converter/src/test/java/net/forwardfire/unitxc/module/UnitXCModuleVolumeTest.java b/unitxc-converter/src/test/java/net/forwardfire/unitxc/module/UnitXCModuleVolumeTest.java
similarity index 100%
rename from ff-unitxc-converter/src/test/java/net/forwardfire/unitxc/module/UnitXCModuleVolumeTest.java
rename to unitxc-converter/src/test/java/net/forwardfire/unitxc/module/UnitXCModuleVolumeTest.java