Code refactoring :

 - rename ucoinj into duniter4j
 - merge module elasticsearch and elasticsearch-plugin

.gitignore

@@ -7,6 +7,6 @@
 .classpath
 .settings
 .idea
-ucoinj-cesium/src/cesium/**/*.*
+duniter4j-cesium/src/cesium/**/*.*
 target
 */target
\ No newline at end of file

.gitmodules

-[submodule "ucoinj-cesium/src/main/cesium"]
-	path = ucoinj-cesium/src/main/cesium
+[submodule "duniter4j-cesium/src/main/cesium"]
+	path = duniter4j-cesium/src/main/cesium
 	url = git://github.com/ucoin-io/cesium.git
-[submodule "ucoinj-elasticsearch/src/main/resources/cities"]
-	path = ucoinj-elasticsearch/src/main/resources/cities
+[submodule "duniter4j-elasticsearch/src/main/resources/cities"]
+	path = duniter4j-elasticsearch/src/main/resources/cities
 	url = git://github.com/David-Haim/CountriesToCitiesJSON.git

README.md

-ucoinj
+duniter4j
 ======
 
 uCoin Java Client API.
@@ -7,7 +7,7 @@ uCoin Java Client API.
 
 ## Architecture
 
-uCoinj has four main components :
+duniter4j has four main components :
 
  - shared: common classes
  
@@ -39,25 +39,25 @@ sudo apt-get install openjdk-8-jre
        
     No installation need for Windows (include in binaries) 
   
- - Download lastest release of file ucoinj-elasticsearch-X.Y-standalone.zip
+ - Download lastest release of file duniter4j-elasticsearch-X.Y-standalone.zip
  
  - Unzip, then start a elasticsearch node, just do :
  
 ```bash
-unzip ucoinj-elasticsearch-X.Y-standalone.zip
-cd ucoinj-elasticsearch-X.Y
-./ucoinj-elasticsearch.sh start index -h <node_host> -p <node_port>
+unzip duniter4j-elasticsearch-X.Y-standalone.zip
+cd duniter4j-elasticsearch-X.Y
+./duniter4j-elasticsearch.sh start index -h <node_host> -p <node_port>
 ```
 
 Example on meta_brouzouf test currency :
 
 ```bash
-$ ./ucoinj-elasticsearch.sh start index -h  metab.ucoin.io -p 9201
-2016-01-07 23:34:34,771  INFO Starting uCoinj :: ElasticSearch Indexer with arguments [start, index, -h, metab.ucoin.io, -p, 9201]
-2016-01-07 23:34:34,856  INFO Application basedir: /home/user/.ucoinj-elasticsearch
-2016-01-07 23:34:34,861  INFO Starts i18n with locale [fr] at [/home/user/.ucoinj-elasticsearch/data/i18n]
-2016-01-07 23:34:35,683  INFO Starts ElasticSearch node with cluster name [ucoinj-elasticsearch] at [/home/user/.ucoinj-elasticsearch/data].
-*** uCoinj :: Elasticsearch successfully started *** >> To quit, press [Q] or enter
+$ ./duniter4j-elasticsearch.sh start index -h  metab.ucoin.io -p 9201
+2016-01-07 23:34:34,771  INFO Starting duniter4j :: ElasticSearch Indexer with arguments [start, index, -h, metab.ucoin.io, -p, 9201]
+2016-01-07 23:34:34,856  INFO Application basedir: /home/user/.duniter4j-elasticsearch
+2016-01-07 23:34:34,861  INFO Starts i18n with locale [fr] at [/home/user/.duniter4j-elasticsearch/data/i18n]
+2016-01-07 23:34:35,683  INFO Starts ElasticSearch node with cluster name [duniter4j-elasticsearch] at [/home/user/.duniter4j-elasticsearch/data].
+*** duniter4j :: Elasticsearch successfully started *** >> To quit, press [Q] or enter
 2016-01-07 23:34:45,015  INFO Indexing last blocks of [meta_brouzouf] from peer [metab.ucoin.io:9201]
 2016-01-07 23:35:01,597  INFO Indexing block #999 / 47144 (2%)...
 2016-01-07 23:35:15,554  INFO Indexing block #1998 / 47144 (4%)...
@@ -70,9 +70,9 @@ $ ./ucoinj-elasticsearch.sh start index -h  metab.ucoin.io -p 9201
 Show help :
 
 ```bash
-$ ./ucoinj-elasticsearch.sh --help
+$ ./duniter4j-elasticsearch.sh --help
 
-Usage: ucoinj-elaticsearch.<sh|bat> <commands> [options]
+Usage: duniter4j-elaticsearch.<sh|bat> <commands> [options]
 
 Commands:
 
@@ -159,7 +159,7 @@ More documentation here :
     - Linux: after [installation](http://doc.libsodium.org/installation/index.html), make sure the file 'libsodium.so' exists on: /usr/local/lib or /opt/local/lib.
       If not, create a symbolic link.
  
-    - Windows: copy the file 'sodium.dll' into directory 'ucoinj-core/lib/'
+    - Windows: copy the file 'sodium.dll' into directory 'duniter4j-core/lib/'
  
   - Install [Maven 3](http://maven.apache.org/).
 ```
@@ -169,8 +169,8 @@ More documentation here :
   - Get the source code, then compile using Maven:
 
 ```
-	git clone https://github.com/ucoin-io/ucoinj.git
-	cd ucoinj
+	git clone https://github.com/ucoin-io/duniter4j.git
+	cd duniter4j
 	git submodule init
 	git submodule sync
 	git submodule update

ucoinj-core-client/pom.xml → duniter4j-core-client/pom.xml

@@ -2,18 +2,18 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>io.ucoin</groupId>
-    <artifactId>ucoinj</artifactId>
+    <groupId>org.duniter</groupId>
+    <artifactId>duniter4j</artifactId>
     <version>0.1-SNAPSHOT</version>
   </parent>
 
-  <groupId>io.ucoin</groupId>
-  <artifactId>ucoinj-core-client</artifactId>
+  <groupId>org.duniter</groupId>
+  <artifactId>duniter4j-core-client</artifactId>
   <packaging>jar</packaging>
-  <name>UCoin Java :: Core Client API</name>
+  <name>Duniter4j :: Core Client API</name>
 
   <properties>
-    <i18n.bundleOutputName>ucoinj-core-client-i18n</i18n.bundleOutputName>
+    <i18n.bundleOutputName>duniter4j-core-client-i18n</i18n.bundleOutputName>
     <i18n.generateCsvFile>true</i18n.generateCsvFile>
     <i18n.bundleCsvFile>
       ${maven.gen.dir}/resources/META-INF/${i18n.bundleOutputName}.csv
@@ -23,8 +23,8 @@
   </properties>
   <dependencies>
     <dependency>
-      <groupId>io.ucoin</groupId>
-      <artifactId>ucoinj-core-shared</artifactId>
+      <groupId>org.duniter</groupId>
+      <artifactId>duniter4j-core-shared</artifactId>
       <version>${project.version}</version>
     </dependency>
     <!-- LOGGING DEPENDENCIES - SLF4J -->

ucoinj-core-client/src/main/java/io/ucoin/ucoinj/core/client/config/Configuration.java → duniter4j-core-client/src/main/java/org/duniter/core/client/config/Configuration.java

-package io.ucoin.ucoinj.core.client.config;
+package org.duniter.core.client.config;
 
 /*
  * #%L
@@ -24,7 +24,7 @@ package io.ucoin.ucoinj.core.client.config;
 
 
 import com.google.common.base.Charsets;
-import io.ucoin.ucoinj.core.exception.TechnicalException;
+import org.duniter.core.exception.TechnicalException;
 import org.nuiton.config.ApplicationConfig;
 import org.nuiton.config.ApplicationConfigHelper;
 import org.nuiton.config.ApplicationConfigProvider;
@@ -118,7 +118,7 @@ public class Configuration  {
             applicationConfig.parse(args);
 
         } catch (ArgumentsParserException e) {
-            throw new TechnicalException(t("ucoinj.config.parse.error"), e);
+            throw new TechnicalException(t("duniter4j.config.parse.error"), e);
         }
 
         // TODO Review this, this is very dirty to do this...

ucoinj-core-client/src/main/java/io/ucoin/ucoinj/core/client/config/ConfigurationOption.java → duniter4j-core-client/src/main/java/org/duniter/core/client/config/ConfigurationOption.java

-package io.ucoin.ucoinj.core.client.config;
+package org.duniter.core.client.config;
 
 /*
  * #%L
@@ -46,68 +46,68 @@ public enum ConfigurationOption implements ConfigOptionDef {
     // ------------------------------------------------------------------------//
 
     BASEDIR(
-            "ucoinj.basedir",
-            n("ucoinj.config.option.basedir.description"),
-            "${user.home}/.ucoinj",
+            "duniter4j.basedir",
+            n("duniter4j.config.option.basedir.description"),
+            "${user.home}/.config/duniter4j",
             File.class),
 
     DATA_DIRECTORY(
-            "ucoinj.data.directory",
-            n("ucoinj.config.option.data.directory.description"),
-            "${ucoinj.basedir}/data",
+            "duniter4j.data.directory",
+            n("duniter4j.config.option.data.directory.description"),
+            "${duniter4j.basedir}/data",
             File.class),
 
     I18N_DIRECTORY(
-            "ucoinj.i18n.directory",
-            n("ucoinj.config.option.i18n.directory.description"),
-            "${ucoinj.basedir}/i18n",
+            "duniter4j.i18n.directory",
+            n("duniter4j.config.option.i18n.directory.description"),
+            "${duniter4j.basedir}/i18n",
             File.class),
 
     TMP_DIRECTORY(
-            "ucoinj.tmp.directory",
-            n("ucoinj.config.option.tmp.directory.description"),
-            "${ucoinj.data.directory}/temp",
+            "duniter4j.tmp.directory",
+            n("duniter4j.config.option.tmp.directory.description"),
+            "${duniter4j.data.directory}/temp",
             File.class),
 
     CACHE_DIRECTORY(
-            "ucoinj.cache.directory",
-            n("ucoinj.config.option.cache.directory.description"),
-            "${ucoinj.data.directory}/cache",
+            "duniter4j.cache.directory",
+            n("duniter4j.config.option.cache.directory.description"),
+            "${duniter4j.data.directory}/cache",
             File.class),
 
     VERSION(
-            "ucoinj.version",
-            n("ucoinj.config.option.version.description"),
+            "duniter4j.version",
+            n("duniter4j.config.option.version.description"),
             "1.0",
             Version.class),
 
     SITE_URL(
-            "ucoinj.site.url",
-            n("ucoinj.config.option.site.url.description"),
-            "http://ucoin.io/ucoinj",
+            "duniter4j.site.url",
+            n("duniter4j.config.option.site.url.description"),
+            "http://ucoin.io/duniter4j",
             URL.class),
 
     ORGANIZATION_NAME(
-            "ucoinj.organizationName",
-            n("ucoinj.config.option.organizationName.description"),
+            "duniter4j.organizationName",
+            n("duniter4j.config.option.organizationName.description"),
             "e-is.pro",
             String.class),
 
     INCEPTION_YEAR(
-            "ucoinj.inceptionYear",
-            n("ucoinj.config.option.inceptionYear.description"),
+            "duniter4j.inceptionYear",
+            n("duniter4j.config.option.inceptionYear.description"),
             "2011",
             Integer.class),
 
     USER_SALT(
-            "ucoinj.salt",
-            n("ucoinj.config.option.salt.description"),
+            "duniter4j.salt",
+            n("duniter4j.config.option.salt.description"),
             "",
             String.class),
 
     USER_PASSWD(
-            "ucoinj.passwd",
-            n("ucoinj.config.option.passwd.description"),
+            "duniter4j.passwd",
+            n("duniter4j.config.option.passwd.description"),
             "",
             String.class),
 
@@ -120,50 +120,50 @@ public enum ConfigurationOption implements ConfigOptionDef {
     // ------------------------------------------------------------------------//
 
     I18N_LOCALE(
-            "ucoinj.i18n.locale",
-            n("ucoinj.config.option.i18n.locale.description"),
+            "duniter4j.i18n.locale",
+            n("duniter4j.config.option.i18n.locale.description"),
             Locale.FRANCE.getCountry(),
             Locale.class,
             false),
 
     NODE_CURRENCY(
-            "ucoinj.node.currency",
-            n("ucoinj.config.option.node.currency.description"),
+            "duniter4j.node.currency",
+            n("duniter4j.config.option.node.currency.description"),
             "meta_brouzouf",
             String.class,
             false),
 
     NODE_PROTOCOL(
-            "ucoinj.node.protocol",
-            n("ucoinj.config.option.node.protocol.description"),
+            "duniter4j.node.protocol",
+            n("duniter4j.config.option.node.protocol.description"),
             "http",
             String.class,
             false),
 
     NODE_HOST(
-            "ucoinj.node.host",
-            n("ucoinj.config.option.node.host.description"),
+            "duniter4j.node.host",
+            n("duniter4j.config.option.node.host.description"),
             "metab.ucoin.io",
             String.class,
             false),
 
     NODE_PORT(
-            "ucoinj.node.port",
-            n("ucoinj.config.option.node.port.description"),
+            "duniter4j.node.port",
+            n("duniter4j.config.option.node.port.description"),
             "9201",
             Integer.class,
             false),
 
     NODE_URL(
-            "ucoinj.node.url",
-            n("ucoinj.config.option.node.port.description"),
-            "${ucoinj.node.protocol}://${ucoinj.node.host}:${ucoinj.node.port}",
+            "duniter4j.node.url",
+            n("duniter4j.config.option.node.port.description"),
+            "${duniter4j.node.protocol}://${duniter4j.node.host}:${duniter4j.node.port}",
             URL.class,
             false),
 
     NETWORK_TIMEOUT(
-            "ucoinj.network.timeout",
-            n("ucoinj.config.option.network.timeout.description"),
+            "duniter4j.network.timeout",
+            n("duniter4j.config.option.network.timeout.description"),
             "100000", // = 10 s
             Integer.class,
             false),
@@ -176,30 +176,30 @@ public enum ConfigurationOption implements ConfigOptionDef {
             false),
 
     NODE_ELASTICSEARCH_PROTOCOL(
-            "ucoinj.node.elasticsearch.protocol",
-            n("ucoinj.config.option.node.elasticsearch.protocol.description"),
+            "duniter4j.node.elasticsearch.protocol",
+            n("duniter4j.config.option.node.elasticsearch.protocol.description"),
             "http",
             String.class,
             false),
 
     NODE_ELASTICSEARCH_HOST(
-            "ucoinj.node.elasticsearch.host",
-            n("ucoinj.config.option.node.elasticsearch.host.description"),
+            "duniter4j.node.elasticsearch.host",
+            n("duniter4j.config.option.node.elasticsearch.host.description"),
             "localhost",
             String.class,
             false),
 
     NODE_ELASTICSEARCH_PORT(
-            "ucoinj.node.elasticsearch.port",
-            n("ucoinj.config.option.node.elasticsearch.port.description"),
+            "duniter4j.node.elasticsearch.port",
+            n("duniter4j.config.option.node.elasticsearch.port.description"),
             "9200",
             Integer.class,
             false),
 
     NODE_ELASTICSEARCH_URL(
-            "ucoinj.node.elasticsearch.url",
-            n("ucoinj.config.option.node.elasticsearch.url.description"),
-            "${ucoinj.node.elasticsearch.protocol}://${ucoinj.node.elasticsearch.host}:${ucoinj.node.elasticsearch.port}",
+            "duniter4j.node.elasticsearch.url",
+            n("duniter4j.config.option.node.elasticsearch.url.description"),
+            "${duniter4j.node.elasticsearch.protocol}://${duniter4j.node.elasticsearch.host}:${duniter4j.node.elasticsearch.port}",
             URL.class,
             false)
     ;

ucoinj-core-client/src/main/java/io/ucoin/ucoinj/core/client/config/ConfigurationProvider.java → duniter4j-core-client/src/main/java/org/duniter/core/client/config/ConfigurationProvider.java

-package io.ucoin.ucoinj.core.client.config;
+package org.duniter.core.client.config;
 
 /*
  * #%L
@@ -41,12 +41,12 @@ public class ConfigurationProvider implements ApplicationConfigProvider {
 
 	@Override
 	public String getName() {
-		return "ucoinj";
+		return "duniter4j";
 	}
 
 	@Override
 	public String getDescription(Locale locale) {
-		return l(locale, "ucoinj.config");
+		return l(locale, "duniter4j.config");
 	}
 
 	@Override

ucoinj-core-client/src/main/java/io/ucoin/ucoinj/core/client/dao/CurrencyDao.java → duniter4j-core-client/src/main/java/org/duniter/core/client/dao/CurrencyDao.java

-package io.ucoin.ucoinj.core.client.dao;
+package org.duniter.core.client.dao;
 
 /*
  * #%L
@@ -22,8 +22,8 @@ package io.ucoin.ucoinj.core.client.dao;
  * #L%
  */
 
-import io.ucoin.ucoinj.core.beans.Bean;
-import io.ucoin.ucoinj.core.client.model.local.Currency;
+import org.duniter.core.beans.Bean;
+import org.duniter.core.client.model.local.Currency;
 
 import java.util.List;
 import java.util.Map;

ucoinj-core-client/src/main/java/io/ucoin/ucoinj/core/client/dao/EntityDao.java → duniter4j-core-client/src/main/java/org/duniter/core/client/dao/EntityDao.java

-package io.ucoin.ucoinj.core.client.dao;
+package org.duniter.core.client.dao;
 
 /*
  * #%L
@@ -22,8 +22,8 @@ package io.ucoin.ucoinj.core.client.dao;
  * #L%
  */
 
-import io.ucoin.ucoinj.core.beans.Bean;
-import io.ucoin.ucoinj.core.client.model.local.LocalEntity;
+import org.duniter.core.beans.Bean;
+import org.duniter.core.client.model.local.LocalEntity;
 
 /**
  * Created by blavenie on 29/12/15.

ucoinj-core-client/src/main/java/io/ucoin/ucoinj/core/client/dao/PeerDao.java → duniter4j-core-client/src/main/java/org/duniter/core/client/dao/PeerDao.java

-package io.ucoin.ucoinj.core.client.dao;
+package org.duniter.core.client.dao;
 
 /*
  * #%L
@@ -22,7 +22,7 @@ package io.ucoin.ucoinj.core.client.dao;
  * #L%
  */
 
-import io.ucoin.ucoinj.core.client.model.local.Peer;
+import org.duniter.core.client.model.local.Peer;
 
 import java.util.List;
 

ucoinj-core-client/src/main/java/io/ucoin/ucoinj/core/client/dao/mem/MemoryCurrencyDaoImpl.java → duniter4j-core-client/src/main/java/org/duniter/core/client/dao/mem/MemoryCurrencyDaoImpl.java

-package io.ucoin.ucoinj.core.client.dao.mem;
+package org.duniter.core.client.dao.mem;
 
 /*
  * #%L
@@ -22,9 +22,7 @@ package io.ucoin.ucoinj.core.client.dao.mem;
  * #L%
  */
 
-import io.ucoin.ucoinj.core.client.dao.CurrencyDao;
-import io.ucoin.ucoinj.core.client.model.local.Currency;
-import io.ucoin.ucoinj.core.util.CollectionUtils;
+import org.duniter.core.client.dao.CurrencyDao;
 
 import java.util.*;
 
@@ -34,12 +32,12 @@ import java.util.*;
 public class MemoryCurrencyDaoImpl implements CurrencyDao {
 
 
-    private Map<Long, Currency> currencies = new HashMap<>();
+    private Map<Long, org.duniter.core.client.model.local.Currency> currencies = new HashMap<>();
 
     private Map<Long, Map<Integer, Long>> currencyUDsByBlock = new HashMap<>();
 
     @Override
-    public Currency create(final Currency entity) {
+    public org.duniter.core.client.model.local.Currency create(final org.duniter.core.client.model.local.Currency entity) {
 
         long id = getMaxId() + 1;
         entity.setId(id);
@@ -50,31 +48,31 @@ public class MemoryCurrencyDaoImpl implements CurrencyDao {
     }
 
     @Override
-    public Currency update(final Currency currency) {
+    public org.duniter.core.client.model.local.Currency update(final org.duniter.core.client.model.local.Currency currency) {
         currencies.put(currency.getId(), currency);
         return currency;
     }
 
     @Override
-    public void remove(final Currency currency) {
+    public void remove(final org.duniter.core.client.model.local.Currency currency) {
         currencies.remove(currency.getId());
     }
 
     @Override
-    public List<Currency> getCurrencies(long accountId) {
-        List<Currency> result = new ArrayList<>();
+    public List<org.duniter.core.client.model.local.Currency> getCurrencies(long accountId) {
+        List<org.duniter.core.client.model.local.Currency> result = new ArrayList<>();
         result.addAll(currencies.values());
         return result;
     }
 
     @Override
-    public Currency getById(long currencyId) {
+    public org.duniter.core.client.model.local.Currency getById(long currencyId) {
         return currencies.get(currencyId);
     }
 
     @Override
     public String getCurrencyNameById(long currencyId) {
-        Currency currency = getById(currencyId);
+        org.duniter.core.client.model.local.Currency currency = getById(currencyId);
         if (currency == null) {
             return null;
         }
@@ -83,7 +81,7 @@ public class MemoryCurrencyDaoImpl implements CurrencyDao {
 
     @Override
     public Long getCurrencyIdByName(String currencyName) {
-        for(Currency currency: currencies.values()) {
+        for(org.duniter.core.client.model.local.Currency currency: currencies.values()) {
             if (currencyName.equalsIgnoreCase(currency.getCurrencyName())) {
                 return currency.getId();
             }
@@ -103,7 +101,7 @@ public class MemoryCurrencyDaoImpl implements CurrencyDao {
 
     @Override
     public long getLastUD(long currencyId) {
-        Currency currency = getById(currencyId);
+        org.duniter.core.client.model.local.Currency currency = getById(currencyId);
         if (currency == null) {
             return -1;
         }

ucoinj-core-client/src/main/java/io/ucoin/ucoinj/core/client/dao/mem/MemoryPeerDaoImpl.java → duniter4j-core-client/src/main/java/org/duniter/core/client/dao/mem/MemoryPeerDaoImpl.java

-package io.ucoin.ucoinj.core.client.dao.mem;
+package org.duniter.core.client.dao.mem;
 
 /*
  * #%L
@@ -22,9 +22,8 @@ package io.ucoin.ucoinj.core.client.dao.mem;
  * #L%
  */
 
-import io.ucoin.ucoinj.core.client.dao.PeerDao;
-import io.ucoin.ucoinj.core.client.model.bma.NetworkPeers;
-import io.ucoin.ucoinj.core.client.model.local.Peer;
+import org.duniter.core.client.dao.PeerDao;
+import org.duniter.core.client.model.local.Peer;
 
 import java.util.ArrayList;
 import java.util.HashMap;

ucoinj-core-client/src/main/java/io/ucoin/ucoinj/core/client/model/Account.java → duniter4j-core-client/src/main/java/org/duniter/core/client/model/Account.java

-package io.ucoin.ucoinj.core.client.model;
+package org.duniter.core.client.model;
 
 /*
  * #%L
@@ -23,7 +23,7 @@ package io.ucoin.ucoinj.core.client.model;
  */
 
 
-import io.ucoin.ucoinj.core.client.model.local.LocalEntity;
+import org.duniter.core.client.model.local.LocalEntity;
 
 /**
  * Created by eis on 07/02/15.

ucoinj-core-client/src/main/java/io/ucoin/ucoinj/core/client/model/BasicIdentity.java → duniter4j-core-client/src/main/java/org/duniter/core/client/model/BasicIdentity.java

-package io.ucoin.ucoinj.core.client.model;
+package org.duniter.core.client.model;
 
 /*
  * #%L

ucoinj-core-client/src/main/java/io/ucoin/ucoinj/core/client/model/Currency.java → duniter4j-core-client/src/main/java/org/duniter/core/client/model/Currency.java

-package io.ucoin.ucoinj.core.client.model;
+package org.duniter.core.client.model;
 
 /*
  * #%L
@@ -23,7 +23,7 @@ package io.ucoin.ucoinj.core.client.model;
  */
 
 
-import io.ucoin.ucoinj.core.client.model.local.Peer;
+import org.duniter.core.client.model.local.Peer;
 
 import java.io.Serializable;
 import java.util.ArrayList;

ucoinj-core-client/src/main/java/io/ucoin/ucoinj/core/client/model/Member.java → duniter4j-core-client/src/main/java/org/duniter/core/client/model/Member.java

-package io.ucoin.ucoinj.core.client.model;
+package org.duniter.core.client.model;
 
 /*
  * #%L
@@ -23,7 +23,7 @@ package io.ucoin.ucoinj.core.client.model;
  */
 
 
-import io.ucoin.ucoinj.core.client.model.local.Identity;
+import org.duniter.core.client.model.local.Identity;
 
 public class Member extends Identity {
 

ucoinj-core-client/src/main/java/io/ucoin/ucoinj/core/client/model/ModelUtils.java → duniter4j-core-client/src/main/java/org/duniter/core/client/model/ModelUtils.java

-package io.ucoin.ucoinj.core.client.model;
+package org.duniter.core.client.model;
 
 /*
  * #%L
@@ -27,8 +27,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import io.ucoin.ucoinj.core.client.model.local.Certification;
-import io.ucoin.ucoinj.core.client.model.local.Movement;
+import org.duniter.core.client.model.local.Certification;
+import org.duniter.core.client.model.local.Movement;
 
 /**
  * Helper class on model entities

ucoinj-core-client/src/main/java/io/ucoin/ucoinj/core/client/model/TxOutput.java → duniter4j-core-client/src/main/java/org/duniter/core/client/model/TxOutput.java

-package io.ucoin.ucoinj.core.client.model;
+package org.duniter.core.client.model;
 
 /*
  * #%L
@@ -33,6 +33,8 @@ public class TxOutput implements Serializable {
     
 	private long amount;
 
+	private int base;
+
 	public String getPubKey() {
 		return pubKey;
 	}
@@ -47,5 +49,13 @@ public class TxOutput implements Serializable {
 
 	public void setAmount(long amount) {
 		this.amount = amount;
-	}    
+	}
+
+	public int getBase() {
+		return base;
+	}
+
+	public void setBase(int base) {
+		this.base = base;
+	}
 }