initial work towards OSGi

refactored packages so they all start with org.qora

added some attempt at OSGi mega bundle using Maven (doesn't work)

.classpath

@@ -23,7 +23,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -33,6 +33,14 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" path="target/generated-sources/annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
 		<attributes>
 			<attribute name="optional" value="true"/>
@@ -41,10 +49,5 @@
 			<attribute name="m2e-apt" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="target/generated-sources/annotations">
-		<attributes>
-			<attribute name="optional" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

.project

@@ -17,6 +17,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>

.settings/org.eclipse.core.resources.prefs

@@ -2,5 +2,6 @@ eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
 encoding//src/test/java=UTF-8
+encoding//target/generated-sources/package-info=UTF-8
 encoding/<project>=UTF-8
 encoding/src=UTF-8

.settings/org.eclipse.pde.core.prefs

@@ -0,0 +1,2 @@
+BUNDLE_ROOT_PATH=target/classes
+eclipse.preferences.version=1

osgi-console.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+BUNDLES="org.apache.felix.gogo.runtime org.apache.felix.gogo.shell org.apache.felix.gogo.command org.eclipse.equinox.console"
+JAR=org.eclipse.osgi
+PLUGIN_DIR=/usr/local/lib/eclipse/plugins
+
+for bundle in ${BUNDLES}; do
+	bundle_path=`echo ${PLUGIN_DIR}/${bundle}_*.jar`
+
+	if [ -z "${bundles_arg}" ]; then
+		bundles_arg=-Dosgi.bundles=
+	else
+		bundles_arg+=,
+	fi
+
+	bundles_arg+=${bundle_path}@start
+done
+
+java ${bundles_arg} -jar ${PLUGIN_DIR}/${JAR}_*.jar -console

pom.xml

@@ -4,7 +4,7 @@
 	<groupId>org.qora</groupId>
 	<artifactId>qora-core</artifactId>
 	<version>2.0.0-SNAPSHOT</version>
-	<packaging>jar</packaging>
+	<packaging>bundle</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<bouncycastle.version>1.60</bouncycastle.version>
@@ -15,6 +15,7 @@
 		<slf4j.version>1.7.12</slf4j.version>
 		<swagger-api.version>2.0.6</swagger-api.version>
 		<swagger-ui.version>3.19.0</swagger-ui.version>
+		<felix-bundle-plugin.version>3.5.0</felix-bundle-plugin.version>
 	</properties>
 	<build>
 		<sourceDirectory>src/main/java</sourceDirectory>
@@ -118,12 +119,12 @@
 				<configuration>
 					<packages>
 						<package>
-							<pattern>data.**</pattern>
-							<template>${project.build.sourceDirectory}/data/package-info.java</template>
+							<pattern>org.qora.data.**</pattern>
+							<template>${project.build.sourceDirectory}/org/qora/data/package-info.java</template>
 						</package>
 						<package>
-							<pattern>api.models**</pattern>
-							<template>${project.build.sourceDirectory}/data/package-info.java</template>
+							<pattern>org.qora.api.model**</pattern>
+							<template>${project.build.sourceDirectory}/org/qora/data/package-info.java</template>
 						</package>
 					</packages>
 					<outputDirectory>${project.build.directory}/generated-sources/package-info</outputDirectory>
@@ -203,7 +204,7 @@
 									implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
 								<transformer
 									implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-									<mainClass>controller.Controller</mainClass>
+									<mainClass>org.qora.controller.Controller</mainClass>
 									<manifestEntries>
 										<Class-Path>. ..</Class-Path>
 									</manifestEntries>
@@ -213,6 +214,20 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<version>${felix-bundle-plugin.version}</version>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Include-Resource>
+							{maven-resources}, {maven-dependencies}
+						</Include-Resource>
+						<Bundle-ClassPath>.,..,{maven-dependencies}</Bundle-ClassPath>
+					</instructions>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 	<repositories>
@@ -235,6 +250,11 @@
 			<artifactId>package-info-maven-plugin</artifactId>
 			<version>1.0.1</version>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>maven-bundle-plugin</artifactId>
+			<version>3.5.0</version>
+		</dependency>
 		<!-- HSQLDB for repository -->
 		<dependency>
 			<groupId>org.hsqldb</groupId>

src/main/java/database/NoDataFoundException.java

@@ -1,16 +0,0 @@
-package database;
-
-import java.sql.SQLException;
-
-/**
- * Exception for use in DB-backed constructors to indicate no matching data found.
- * 
- */
-@SuppressWarnings("serial")
-@Deprecated
-public class NoDataFoundException extends SQLException {
-
-	public NoDataFoundException() {
-	}
-
-}

src/main/java/org/qora/account/Account.java

@@ -1,22 +1,21 @@
-package qora.account;
+package org.qora.account;
 
 import java.math.BigDecimal;
 import java.util.List;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-
-import data.account.AccountBalanceData;
-import data.account.AccountData;
-import data.block.BlockData;
-import data.transaction.TransactionData;
-import qora.assets.Asset;
-import qora.block.Block;
-import qora.block.BlockChain;
-import qora.transaction.Transaction;
-import repository.BlockRepository;
-import repository.DataException;
-import repository.Repository;
+import org.qora.asset.Asset;
+import org.qora.block.Block;
+import org.qora.block.BlockChain;
+import org.qora.data.account.AccountBalanceData;
+import org.qora.data.account.AccountData;
+import org.qora.data.block.BlockData;
+import org.qora.data.transaction.TransactionData;
+import org.qora.repository.BlockRepository;
+import org.qora.repository.DataException;
+import org.qora.repository.Repository;
+import org.qora.transaction.Transaction;
 
 public class Account {
 

src/main/java/org/qora/account/GenesisAccount.java

@@ -1,6 +1,6 @@
-package qora.account;
+package org.qora.account;
 
-import repository.Repository;
+import org.qora.repository.Repository;
 
 public final class GenesisAccount extends PublicKeyAccount {
 

src/main/java/org/qora/account/PrivateKeyAccount.java

@@ -1,10 +1,10 @@
-package qora.account;
+package org.qora.account;
 
-import data.account.AccountData;
-import qora.crypto.Crypto;
-import qora.crypto.Ed25519;
-import repository.Repository;
-import utils.Pair;
+import org.qora.crypto.Crypto;
+import org.qora.crypto.Ed25519;
+import org.qora.data.account.AccountData;
+import org.qora.repository.Repository;
+import org.qora.utils.Pair;
 
 public class PrivateKeyAccount extends PublicKeyAccount {
 

src/main/java/org/qora/account/PublicKeyAccount.java

@@ -1,8 +1,8 @@
-package qora.account;
+package org.qora.account;
 
-import qora.crypto.Crypto;
-import qora.crypto.Ed25519;
-import repository.Repository;
+import org.qora.crypto.Crypto;
+import org.qora.crypto.Ed25519;
+import org.qora.repository.Repository;
 
 public class PublicKeyAccount extends Account {
 

src/main/java/org/qora/api/ApiError.java

@@ -1,4 +1,4 @@
-package api;
+package org.qora.api;
 
 import static java.util.Arrays.stream;
 import static java.util.stream.Collectors.toMap;

src/main/java/org/qora/api/ApiErrorMessage.java

@@ -1,4 +1,4 @@
-package api;
+package org.qora.api;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

src/main/java/org/qora/api/ApiErrors.java

@@ -1,4 +1,4 @@
-package api;
+package org.qora.api;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/org/qora/api/ApiException.java

@@ -1,4 +1,4 @@
-package api;
+package org.qora.api;
 
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;

src/main/java/org/qora/api/ApiExceptionFactory.java

@@ -1,8 +1,8 @@
-package api;
+package org.qora.api;
 
 import javax.servlet.http.HttpServletRequest;
 
-import globalization.Translator;
+import org.qora.globalization.Translator;
 
 public enum ApiExceptionFactory {
 	INSTANCE;

src/main/java/org/qora/api/ApiService.java

@@ -1,4 +1,4 @@
-package api;
+package org.qora.api;
 
 import io.swagger.v3.jaxrs2.integration.resources.OpenApiResource;
 
@@ -14,10 +14,9 @@ import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.jetty.servlets.CrossOriginFilter;
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.servlet.ServletContainer;
-
-import api.resource.AnnotationPostProcessor;
-import api.resource.ApiDefinition;
-import settings.Settings;
+import org.qora.api.resource.AnnotationPostProcessor;
+import org.qora.api.resource.ApiDefinition;
+import org.qora.settings.Settings;
 
 public class ApiService {
 

src/main/java/org/qora/api/Base58TypeAdapter.java

@@ -1,4 +1,4 @@
-package api;
+package org.qora.api;
 
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 

src/main/java/org/qora/api/BigDecimalTypeAdapter.java

@@ -1,4 +1,4 @@
-package api;
+package org.qora.api;
 
 import java.math.BigDecimal;
 

src/main/java/org/qora/api/Constants.java

@@ -1,4 +1,4 @@
-package api;
+package org.qora.api;
 
 import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.PathItem;

src/main/java/org/qora/api/Security.java

@@ -1,4 +1,4 @@
-package api;
+package org.qora.api;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;

src/main/java/org/qora/api/TransactionClassExtractor.java

@@ -1,4 +1,4 @@
-package api;
+package org.qora.api;
 
 import org.eclipse.persistence.descriptors.ClassExtractor;
 import org.eclipse.persistence.sessions.Record;

src/main/java/org/qora/api/TranslatableProperty.java

@@ -1,4 +1,4 @@
-package api;
+package org.qora.api;
 
 interface TranslatableProperty<T> {
 	public String keyName();

src/main/java/org/qora/api/UnmarshalListener.java

@@ -1,8 +1,8 @@
-package api;
+package org.qora.api;
 
 import javax.xml.bind.Unmarshaller.Listener;
 
-import data.transaction.TransactionData;
+import org.qora.data.transaction.TransactionData;
 
 public class UnmarshalListener extends Listener {
 

src/main/java/org/qora/api/model/AssetWithHolders.java

@@ -1,4 +1,4 @@
-package api.models;
+package org.qora.api.model;
 
 import java.util.List;
 
@@ -6,8 +6,9 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 
-import data.account.AccountBalanceData;
-import data.assets.AssetData;
+import org.qora.data.account.AccountBalanceData;
+import org.qora.data.asset.AssetData;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 
 @Schema(description = "Asset info, maybe including asset holders")

src/main/java/org/qora/api/model/BlockWithTransactions.java

@@ -1,4 +1,4 @@
-package api.models;
+package org.qora.api.model;
 
 import java.util.List;
 
@@ -6,8 +6,9 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 
-import data.block.BlockData;
-import data.transaction.TransactionData;
+import org.qora.data.block.BlockData;
+import org.qora.data.transaction.TransactionData;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 
 @Schema(description = "Block info, maybe including transactions")

src/main/java/org/qora/api/model/OrderWithTrades.java

@@ -1,4 +1,4 @@
-package api.models;
+package org.qora.api.model;
 
 import java.util.List;
 
@@ -6,8 +6,9 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 
-import data.assets.OrderData;
-import data.assets.TradeData;
+import org.qora.data.asset.OrderData;
+import org.qora.data.asset.TradeData;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 
 @Schema(description = "Asset order info, maybe including trades")

src/main/java/org/qora/api/model/SimpleTransactionSignRequest.java

@@ -1,4 +1,4 @@
-package api.models;
+package org.qora.api.model;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

src/main/java/org/qora/api/model/TradeWithOrderInfo.java

@@ -1,11 +1,12 @@
-package api.models;
+package org.qora.api.model;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 
-import data.assets.OrderData;
-import data.assets.TradeData;
+import org.qora.data.asset.OrderData;
+import org.qora.data.asset.TradeData;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 
 @Schema(description = "Asset trade, including order info")

src/main/java/org/qora/api/resource/AddressesResource.java

@@ -1,7 +1,6 @@
-package api.resource;
+package org.qora.api.resource;
 
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.ArraySchema;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -19,20 +18,20 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 
-import api.ApiError;
-import api.ApiErrors;
-import api.ApiException;
-import api.ApiExceptionFactory;
-import data.account.AccountBalanceData;
-import data.account.AccountData;
-import qora.account.Account;
-import qora.assets.Asset;
-import qora.crypto.Crypto;
-import repository.DataException;
-import repository.Repository;
-import repository.RepositoryManager;
-import transform.Transformer;
-import utils.Base58;
+import org.qora.account.Account;
+import org.qora.api.ApiError;
+import org.qora.api.ApiErrors;
+import org.qora.api.ApiException;
+import org.qora.api.ApiExceptionFactory;
+import org.qora.asset.Asset;
+import org.qora.crypto.Crypto;
+import org.qora.data.account.AccountBalanceData;
+import org.qora.data.account.AccountData;
+import org.qora.repository.DataException;
+import org.qora.repository.Repository;
+import org.qora.repository.RepositoryManager;
+import org.qora.transform.Transformer;
+import org.qora.utils.Base58;
 
 @Path("/addresses")
 @Produces({MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})

src/main/java/org/qora/api/resource/AdminResource.java

@@ -1,4 +1,4 @@
-package api.resource;
+package org.qora.api.resource;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -15,8 +15,8 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 
-import api.Security;
-import controller.Controller;
+import org.qora.api.Security;
+import org.qora.controller.Controller;
 
 @Path("/admin")
 @Produces({MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})

src/main/java/org/qora/api/resource/AnnotationPostProcessor.java

@@ -1,6 +1,5 @@
-package api.resource;
+package org.qora.api.resource;
 
-import globalization.Translator;
 import io.swagger.v3.core.converter.ModelConverters;
 import io.swagger.v3.jaxrs2.Reader;
 import io.swagger.v3.jaxrs2.ReaderListener;
@@ -22,11 +21,11 @@ import javax.ws.rs.Path;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-
-import api.ApiError;
-import api.ApiErrorMessage;
-import api.ApiErrors;
-import api.ApiService;
+import org.qora.api.ApiError;
+import org.qora.api.ApiErrorMessage;
+import org.qora.api.ApiErrors;
+import org.qora.api.ApiService;
+import org.qora.globalization.Translator;
 
 public class AnnotationPostProcessor implements ReaderListener {
 

src/main/java/org/qora/api/resource/ApiDefinition.java

@@ -1,4 +1,4 @@
-package api.resource;
+package org.qora.api.resource;
 
 import io.swagger.v3.oas.annotations.OpenAPIDefinition;
 import io.swagger.v3.oas.annotations.extensions.Extension;

src/main/java/org/qora/api/resource/AssetsResource.java

@@ -1,4 +1,4 @@
-package api.resource;
+package org.qora.api.resource;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -8,14 +8,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import qora.transaction.Transaction;
-import qora.transaction.Transaction.ValidationResult;
-import repository.DataException;
-import repository.Repository;
-import repository.RepositoryManager;
-import transform.TransformationException;
-import transform.transaction.IssueAssetTransactionTransformer;
-import utils.Base58;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -30,17 +22,25 @@ import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 
-import api.ApiError;
-import api.ApiErrors;
-import api.ApiExceptionFactory;
-import api.models.AssetWithHolders;
-import api.models.OrderWithTrades;
-import api.models.TradeWithOrderInfo;
-import data.account.AccountBalanceData;
-import data.assets.AssetData;
-import data.assets.OrderData;
-import data.assets.TradeData;
-import data.transaction.IssueAssetTransactionData;
+import org.qora.api.ApiError;
+import org.qora.api.ApiErrors;
+import org.qora.api.ApiExceptionFactory;
+import org.qora.api.model.AssetWithHolders;
+import org.qora.api.model.OrderWithTrades;
+import org.qora.api.model.TradeWithOrderInfo;
+import org.qora.data.account.AccountBalanceData;
+import org.qora.data.asset.AssetData;
+import org.qora.data.asset.OrderData;
+import org.qora.data.asset.TradeData;
+import org.qora.data.transaction.IssueAssetTransactionData;
+import org.qora.repository.DataException;
+import org.qora.repository.Repository;
+import org.qora.repository.RepositoryManager;
+import org.qora.transaction.Transaction;
+import org.qora.transaction.Transaction.ValidationResult;
+import org.qora.transform.TransformationException;
+import org.qora.transform.transaction.IssueAssetTransactionTransformer;
+import org.qora.utils.Base58;
 
 @Path("/assets")
 @Produces({MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})

src/main/java/org/qora/api/resource/BlockExplorerResource.java

@@ -1,4 +1,4 @@
-package api.resource;
+package org.qora.api.resource;
 
 import java.io.BufferedReader;
 import java.io.IOException;

src/main/java/org/qora/api/resource/BlocksResource.java

@@ -1,7 +1,5 @@
-package api.resource;
+package org.qora.api.resource;
 
-import data.block.BlockData;
-import data.transaction.TransactionData;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Content;
@@ -24,16 +22,18 @@ import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 
-import api.ApiError;
-import api.ApiErrors;
-import api.ApiException;
-import api.ApiExceptionFactory;
-import api.models.BlockWithTransactions;
-import qora.block.Block;
-import repository.DataException;
-import repository.Repository;
-import repository.RepositoryManager;
-import utils.Base58;
+import org.qora.api.ApiError;
+import org.qora.api.ApiErrors;
+import org.qora.api.ApiException;
+import org.qora.api.ApiExceptionFactory;
+import org.qora.api.model.BlockWithTransactions;
+import org.qora.block.Block;
+import org.qora.data.block.BlockData;
+import org.qora.data.transaction.TransactionData;
+import org.qora.repository.DataException;
+import org.qora.repository.Repository;
+import org.qora.repository.RepositoryManager;
+import org.qora.utils.Base58;
 
 @Path("/blocks")
 @Produces({MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})

src/main/java/org/qora/api/resource/NamesResource.java

@@ -1,4 +1,4 @@
-package api.resource;
+package org.qora.api.resource;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
@@ -6,14 +6,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import qora.transaction.Transaction;
-import qora.transaction.Transaction.ValidationResult;
-import repository.DataException;
-import repository.Repository;
-import repository.RepositoryManager;
-import transform.TransformationException;
-import transform.transaction.RegisterNameTransactionTransformer;
-import utils.Base58;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.POST;
@@ -22,10 +14,18 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 
-import api.ApiError;
-import api.ApiErrors;
-import api.ApiExceptionFactory;
-import data.transaction.RegisterNameTransactionData;
+import org.qora.api.ApiError;
+import org.qora.api.ApiErrors;
+import org.qora.api.ApiExceptionFactory;
+import org.qora.data.transaction.RegisterNameTransactionData;
+import org.qora.repository.DataException;
+import org.qora.repository.Repository;
+import org.qora.repository.RepositoryManager;
+import org.qora.transaction.Transaction;
+import org.qora.transaction.Transaction.ValidationResult;
+import org.qora.transform.TransformationException;
+import org.qora.transform.transaction.RegisterNameTransactionTransformer;
+import org.qora.utils.Base58;
 
 @Path("/names")
 @Produces({	MediaType.TEXT_PLAIN})

src/main/java/org/qora/api/resource/PaymentsResource.java

@@ -1,4 +1,4 @@
-package api.resource;
+package org.qora.api.resource;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
@@ -6,14 +6,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import qora.transaction.Transaction;
-import qora.transaction.Transaction.ValidationResult;
-import repository.DataException;
-import repository.Repository;
-import repository.RepositoryManager;
-import transform.TransformationException;
-import transform.transaction.PaymentTransactionTransformer;
-import utils.Base58;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.POST;
@@ -22,10 +14,18 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 
-import api.ApiError;
-import api.ApiErrors;
-import api.ApiExceptionFactory;
-import data.transaction.PaymentTransactionData;
+import org.qora.api.ApiError;
+import org.qora.api.ApiErrors;
+import org.qora.api.ApiExceptionFactory;
+import org.qora.data.transaction.PaymentTransactionData;
+import org.qora.repository.DataException;
+import org.qora.repository.Repository;
+import org.qora.repository.RepositoryManager;
+import org.qora.transaction.Transaction;
+import org.qora.transaction.Transaction.ValidationResult;
+import org.qora.transform.TransformationException;
+import org.qora.transform.transaction.PaymentTransactionTransformer;
+import org.qora.utils.Base58;
 
 @Path("/payments")
 @Produces({MediaType.TEXT_PLAIN})

src/main/java/org/qora/api/resource/TransactionsResource.java

@@ -1,4 +1,4 @@
-package api.resource;
+package org.qora.api.resource;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -8,10 +8,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import qora.account.PrivateKeyAccount;
-import qora.transaction.Transaction;
-import qora.transaction.Transaction.TransactionType;
-import qora.transaction.Transaction.ValidationResult;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,23 +22,27 @@ import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 
-import com.google.common.primitives.Bytes;
+import org.qora.account.PrivateKeyAccount;
+import org.qora.api.ApiError;
+import org.qora.api.ApiErrors;
+import org.qora.api.ApiException;
+import org.qora.api.ApiExceptionFactory;
+import org.qora.api.model.SimpleTransactionSignRequest;
+import org.qora.data.transaction.GenesisTransactionData;
+import org.qora.data.transaction.PaymentTransactionData;
+import org.qora.data.transaction.TransactionData;
+import org.qora.globalization.Translator;
+import org.qora.repository.DataException;
+import org.qora.repository.Repository;
+import org.qora.repository.RepositoryManager;
+import org.qora.transaction.Transaction;
+import org.qora.transaction.Transaction.TransactionType;
+import org.qora.transaction.Transaction.ValidationResult;
+import org.qora.transform.TransformationException;
+import org.qora.transform.transaction.TransactionTransformer;
+import org.qora.utils.Base58;
 
-import api.ApiError;
-import api.ApiErrors;
-import api.ApiException;
-import api.ApiExceptionFactory;
-import api.models.SimpleTransactionSignRequest;
-import data.transaction.GenesisTransactionData;
-import data.transaction.PaymentTransactionData;
-import data.transaction.TransactionData;
-import globalization.Translator;
-import repository.DataException;
-import repository.Repository;
-import repository.RepositoryManager;
-import transform.TransformationException;
-import transform.transaction.TransactionTransformer;
-import utils.Base58;
+import com.google.common.primitives.Bytes;
 
 @Path("/transactions")
 @Produces({MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})

src/main/java/org/qora/api/resource/UtilsResource.java

@@ -1,4 +1,4 @@
-package api.resource;
+package org.qora.api.resource;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
@@ -6,11 +6,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import qora.account.PrivateKeyAccount;
-import qora.crypto.Crypto;
-import utils.BIP39;
-import utils.Base58;
-import utils.NTP;
 
 import java.security.SecureRandom;
 import java.util.Arrays;
@@ -27,14 +22,19 @@ import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 
+import org.qora.account.PrivateKeyAccount;
+import org.qora.api.ApiError;
+import org.qora.api.ApiErrors;
+import org.qora.api.ApiExceptionFactory;
+import org.qora.crypto.Crypto;
+import org.qora.utils.BIP39;
+import org.qora.utils.Base58;
+import org.qora.utils.NTP;
+
 import com.google.common.hash.HashCode;
 import com.google.common.primitives.Bytes;
 import com.google.common.primitives.Longs;
 
-import api.ApiError;
-import api.ApiErrors;
-import api.ApiExceptionFactory;
-
 @Path("/utils")
 @Produces({
 	MediaType.TEXT_PLAIN

src/main/java/org/qora/asset/Asset.java

@@ -1,9 +1,9 @@
-package qora.assets;
+package org.qora.asset;
 
-import data.assets.AssetData;
-import data.transaction.IssueAssetTransactionData;
-import repository.DataException;
-import repository.Repository;
+import org.qora.data.asset.AssetData;
+import org.qora.data.transaction.IssueAssetTransactionData;
+import org.qora.repository.DataException;
+import org.qora.repository.Repository;
 
 public class Asset {
 

src/main/java/org/qora/asset/Order.java

@@ -1,4 +1,4 @@
-package qora.assets;
+package org.qora.asset;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -8,18 +8,17 @@ import java.util.List;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.qora.account.Account;
+import org.qora.account.PublicKeyAccount;
+import org.qora.data.asset.AssetData;
+import org.qora.data.asset.OrderData;
+import org.qora.data.asset.TradeData;
+import org.qora.repository.AssetRepository;
+import org.qora.repository.DataException;
+import org.qora.repository.Repository;
 
 import com.google.common.hash.HashCode;
 
-import data.assets.AssetData;
-import data.assets.OrderData;
-import data.assets.TradeData;
-import qora.account.Account;
-import qora.account.PublicKeyAccount;
-import repository.AssetRepository;
-import repository.DataException;
-import repository.Repository;
-
 public class Order {
 
 	private static final Logger LOGGER = LogManager.getLogger(Order.class);

src/main/java/org/qora/asset/Trade.java

@@ -1,12 +1,12 @@
-package qora.assets;
+package org.qora.asset;
 
-import data.assets.OrderData;
-import data.assets.TradeData;
-import qora.account.Account;
-import qora.account.PublicKeyAccount;
-import repository.AssetRepository;
-import repository.DataException;
-import repository.Repository;
+import org.qora.account.Account;
+import org.qora.account.PublicKeyAccount;
+import org.qora.data.asset.OrderData;
+import org.qora.data.asset.TradeData;
+import org.qora.repository.AssetRepository;
+import org.qora.repository.DataException;
+import org.qora.repository.Repository;
 
 public class Trade {
 

src/main/java/org/qora/at/AT.java

@@ -1,20 +1,19 @@
-package qora.at;
+package org.qora.at;
 
 import java.math.BigDecimal;
 import java.nio.ByteBuffer;
 import java.util.List;
 
 import org.ciyam.at.MachineState;
-
-import data.at.ATData;
-import data.at.ATStateData;
-import data.transaction.DeployATTransactionData;
-import qora.assets.Asset;
-import qora.crypto.Crypto;
-import qora.transaction.ATTransaction;
-import repository.ATRepository;
-import repository.DataException;
-import repository.Repository;
+import org.qora.asset.Asset;
+import org.qora.crypto.Crypto;
+import org.qora.data.at.ATData;
+import org.qora.data.at.ATStateData;
+import org.qora.data.transaction.DeployATTransactionData;
+import org.qora.repository.ATRepository;
+import org.qora.repository.DataException;
+import org.qora.repository.Repository;
+import org.qora.transaction.ATTransaction;
 
 public class AT {
 

src/main/java/org/qora/at/BlockchainAPI.java

@@ -1,4 +1,4 @@
-package qora.at;
+package org.qora.at;
 
 import static java.util.Arrays.stream;
 import static java.util.stream.Collectors.toMap;
@@ -9,16 +9,15 @@ import java.util.Map;
 
 import org.ciyam.at.MachineState;
 import org.ciyam.at.Timestamp;
-
-import data.block.BlockData;
-import data.transaction.ATTransactionData;
-import data.transaction.PaymentTransactionData;
-import data.transaction.TransactionData;
-import qora.account.Account;
-import qora.block.Block;
-import qora.transaction.Transaction;
-import repository.BlockRepository;
-import repository.DataException;
+import org.qora.account.Account;
+import org.qora.block.Block;
+import org.qora.data.block.BlockData;
+import org.qora.data.transaction.ATTransactionData;
+import org.qora.data.transaction.PaymentTransactionData;
+import org.qora.data.transaction.TransactionData;
+import org.qora.repository.BlockRepository;
+import org.qora.repository.DataException;
+import org.qora.transaction.Transaction;
 
 public enum BlockchainAPI {
 

src/main/java/org/qora/at/QoraATAPI.java

@@ -1,4 +1,4 @@
-package qora.at;
+package org.qora.at;
 
 import java.math.BigDecimal;
 import java.security.MessageDigest;
@@ -13,22 +13,21 @@ import org.ciyam.at.IllegalFunctionCodeException;
 import org.ciyam.at.MachineState;
 import org.ciyam.at.OpCode;
 import org.ciyam.at.Timestamp;
+import org.qora.account.Account;
+import org.qora.account.PublicKeyAccount;
+import org.qora.asset.Asset;
+import org.qora.crypto.Crypto;
+import org.qora.data.at.ATData;
+import org.qora.data.block.BlockData;
+import org.qora.data.transaction.ATTransactionData;
+import org.qora.data.transaction.MessageTransactionData;
+import org.qora.data.transaction.TransactionData;
+import org.qora.repository.DataException;
+import org.qora.repository.Repository;
+import org.qora.transaction.ATTransaction;
 
 import com.google.common.primitives.Bytes;
 
-import data.at.ATData;
-import data.block.BlockData;
-import data.transaction.ATTransactionData;
-import data.transaction.MessageTransactionData;
-import data.transaction.TransactionData;
-import qora.account.Account;
-import qora.account.PublicKeyAccount;
-import qora.assets.Asset;
-import qora.crypto.Crypto;
-import qora.transaction.ATTransaction;
-import repository.DataException;
-import repository.Repository;
-
 public class QoraATAPI extends API {
 
 	// Useful constants

src/main/java/org/qora/at/QoraATLogger.java

@@ -1,9 +1,8 @@
-package qora.at;
+package org.qora.at;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-
-import qora.at.AT;
+import org.qora.at.AT;
 
 public class QoraATLogger implements org.ciyam.at.LoggerInterface {
 

src/main/java/org/qora/at/QoraFunctionCode.java

@@ -1,4 +1,4 @@
-package qora.at;
+package org.qora.at;
 
 import java.io.UnsupportedEncodingException;
 import java.util.Arrays;

src/main/java/org/qora/block/Block.java

@@ -1,4 +1,4 @@
-package qora.block;
+package org.qora.block;
 
 import static java.util.Arrays.stream;
 import static java.util.stream.Collectors.toMap;
@@ -13,33 +13,32 @@ import java.util.stream.Collectors;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.qora.account.Account;
+import org.qora.account.PrivateKeyAccount;
+import org.qora.account.PublicKeyAccount;
+import org.qora.asset.Asset;
+import org.qora.at.AT;
+import org.qora.crypto.Crypto;
+import org.qora.data.at.ATData;
+import org.qora.data.at.ATStateData;
+import org.qora.data.block.BlockData;
+import org.qora.data.block.BlockTransactionData;
+import org.qora.data.transaction.TransactionData;
+import org.qora.repository.ATRepository;
+import org.qora.repository.BlockRepository;
+import org.qora.repository.DataException;
+import org.qora.repository.Repository;
+import org.qora.transaction.ATTransaction;
+import org.qora.transaction.GenesisTransaction;
+import org.qora.transaction.Transaction;
+import org.qora.transform.TransformationException;
+import org.qora.transform.block.BlockTransformer;
+import org.qora.transform.transaction.TransactionTransformer;
+import org.qora.utils.Base58;
+import org.qora.utils.NTP;
 
 import com.google.common.primitives.Bytes;
 
-import data.at.ATData;
-import data.at.ATStateData;
-import data.block.BlockData;
-import data.block.BlockTransactionData;
-import data.transaction.TransactionData;
-import qora.account.Account;
-import qora.account.PrivateKeyAccount;
-import qora.account.PublicKeyAccount;
-import qora.assets.Asset;
-import qora.at.AT;
-import qora.crypto.Crypto;
-import qora.transaction.ATTransaction;
-import qora.transaction.GenesisTransaction;
-import qora.transaction.Transaction;
-import repository.ATRepository;
-import repository.BlockRepository;
-import repository.DataException;
-import repository.Repository;
-import transform.TransformationException;
-import transform.block.BlockTransformer;
-import transform.transaction.TransactionTransformer;
-import utils.Base58;
-import utils.NTP;
-
 /*
  * Typical use-case scenarios:
  * 

src/main/java/org/qora/block/BlockChain.java

@@ -1,4 +1,4 @@
-package qora.block;
+package org.qora.block;
 
 import java.math.BigDecimal;
 import java.math.MathContext;
@@ -11,15 +11,14 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 import org.json.simple.JSONObject;
-
-import data.assets.AssetData;
-import data.block.BlockData;
-import qora.assets.Asset;
-import repository.BlockRepository;
-import repository.DataException;
-import repository.Repository;
-import repository.RepositoryManager;
-import settings.Settings;
+import org.qora.asset.Asset;
+import org.qora.data.asset.AssetData;
+import org.qora.data.block.BlockData;
+import org.qora.repository.BlockRepository;
+import org.qora.repository.DataException;
+import org.qora.repository.Repository;
+import org.qora.repository.RepositoryManager;
+import org.qora.settings.Settings;
 
 /**
  * Class representing the blockchain as a whole.

src/main/java/org/qora/block/BlockGenerator.java

@@ -1,22 +1,21 @@
-package qora.block;
+package org.qora.block;
 
 import java.util.Arrays;
 import java.util.List;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-
-import data.block.BlockData;
-import data.transaction.TransactionData;
-import qora.account.PrivateKeyAccount;
-import qora.block.Block.ValidationResult;
-import qora.transaction.Transaction;
-import repository.BlockRepository;
-import repository.DataException;
-import repository.Repository;
-import repository.RepositoryManager;
-import settings.Settings;
-import utils.Base58;
+import org.qora.account.PrivateKeyAccount;
+import org.qora.block.Block.ValidationResult;
+import org.qora.data.block.BlockData;
+import org.qora.data.transaction.TransactionData;
+import org.qora.repository.BlockRepository;
+import org.qora.repository.DataException;
+import org.qora.repository.Repository;
+import org.qora.repository.RepositoryManager;
+import org.qora.settings.Settings;
+import org.qora.transaction.Transaction;
+import org.qora.utils.Base58;
 
 // Forging new blocks
 

src/main/java/org/qora/block/GenesisBlock.java

@@ -1,4 +1,4 @@
-package qora.block;
+package org.qora.block;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -12,20 +12,19 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
+import org.qora.account.GenesisAccount;
+import org.qora.crypto.Crypto;
+import org.qora.data.block.BlockData;
+import org.qora.data.transaction.GenesisTransactionData;
+import org.qora.data.transaction.TransactionData;
+import org.qora.repository.DataException;
+import org.qora.repository.Repository;
+import org.qora.settings.Settings;
+import org.qora.transaction.Transaction;
 
 import com.google.common.primitives.Bytes;
 import com.google.common.primitives.Longs;
 
-import data.block.BlockData;
-import data.transaction.GenesisTransactionData;
-import data.transaction.TransactionData;
-import qora.account.GenesisAccount;
-import qora.crypto.Crypto;
-import qora.transaction.Transaction;
-import repository.DataException;
-import repository.Repository;
-import settings.Settings;
-
 public class GenesisBlock extends Block {
 
 	private static final Logger LOGGER = LogManager.getLogger(GenesisBlock.class);

src/main/java/org/qora/blockgenerator.java

@@ -1,15 +1,15 @@
+package org.qora;
 import java.security.SecureRandom;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-
-import qora.block.BlockChain;
-import qora.block.BlockGenerator;
-import repository.DataException;
-import repository.RepositoryFactory;
-import repository.RepositoryManager;
-import repository.hsqldb.HSQLDBRepositoryFactory;
-import utils.Base58;
+import org.qora.block.BlockChain;
+import org.qora.block.BlockGenerator;
+import org.qora.repository.DataException;
+import org.qora.repository.RepositoryFactory;
+import org.qora.repository.RepositoryManager;
+import org.qora.repository.hsqldb.HSQLDBRepositoryFactory;
+import org.qora.utils.Base58;
 
 public class blockgenerator {
 

src/main/java/org/qora/brokenmd160.java

@@ -1,6 +1,7 @@
-import com.google.common.hash.HashCode;
+package org.qora;
+import org.qora.crypto.BrokenMD160;
 
-import qora.crypto.BrokenMD160;
+import com.google.common.hash.HashCode;
 
 @SuppressWarnings("deprecation")
 public class brokenmd160 {

src/main/java/org/qora/controller/Controller.java

@@ -1,17 +1,16 @@
-package controller;
-
-import api.ApiService;
-import qora.block.BlockChain;
-import qora.block.BlockGenerator;
-import repository.DataException;
-import repository.RepositoryFactory;
-import repository.RepositoryManager;
-import repository.hsqldb.HSQLDBRepositoryFactory;
-import settings.Settings;
-import utils.Base58;
+package org.qora.controller;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.qora.api.ApiService;
+import org.qora.block.BlockChain;
+import org.qora.block.BlockGenerator;
+import org.qora.repository.DataException;
+import org.qora.repository.RepositoryFactory;
+import org.qora.repository.RepositoryManager;
+import org.qora.repository.hsqldb.HSQLDBRepositoryFactory;
+import org.qora.settings.Settings;
+import org.qora.utils.Base58;
 
 public class Controller {
 

src/main/java/org/qora/crosschain/BTC.java

@@ -1,4 +1,4 @@
-package crosschain;
+package org.qora.crosschain;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataOutputStream;
@@ -43,8 +43,7 @@ import org.bitcoinj.utils.Threading;
 import org.bitcoinj.wallet.KeyChainGroup;
 import org.bitcoinj.wallet.Wallet;
 import org.bitcoinj.wallet.listeners.WalletCoinsReceivedEventListener;
-
-import settings.Settings;
+import org.qora.settings.Settings;
 
 public class BTC {
 

src/main/java/org/qora/crypto/BrokenMD160.java

@@ -1,4 +1,4 @@
-package qora.crypto;
+package org.qora.crypto;
 
 /**
  * <b>BROKEN RIPEMD160</b>

src/main/java/org/qora/crypto/Crypto.java

@@ -1,11 +1,11 @@
-package qora.crypto;
+package org.qora.crypto;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 
-import qora.account.Account;
-import utils.Base58;
+import org.qora.account.Account;
+import org.qora.utils.Base58;
 
 public class Crypto {
 

src/main/java/org/qora/crypto/CryptoBytes.java

@@ -1,4 +1,4 @@
-package qora.crypto;
+package org.qora.crypto;
 
 //Punisher.NaCl;
 

src/main/java/org/qora/crypto/Ed25519.java

@@ -1,12 +1,11 @@
-package qora.crypto;
+package org.qora.crypto;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
+import org.qora.utils.Pair;
 import org.whispersystems.curve25519.java.*;
 
-import utils.Pair;
-
 public class Ed25519 {
 	
 	public static byte[] getSharedSecret(byte[] public_key, byte[] private_key)

src/main/java/org/qora/data/PaymentData.java

@@ -1,4 +1,4 @@
-package data;
+package org.qora.data;
 
 import java.math.BigDecimal;
 

src/main/java/org/qora/data/account/AccountBalanceData.java

@@ -1,4 +1,4 @@
-package data.account;
+package org.qora.data.account;
 
 import java.math.BigDecimal;
 

src/main/java/org/qora/data/account/AccountData.java

@@ -1,4 +1,4 @@
-package data.account;
+package org.qora.data.account;
 
 public class AccountData {
 

src/main/java/org/qora/data/asset/AssetData.java

@@ -1,4 +1,4 @@
-package data.assets;
+package org.qora.data.asset;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

src/main/java/org/qora/data/asset/OrderData.java

@@ -1,4 +1,4 @@
-package data.assets;
+package org.qora.data.asset;
 
 import java.math.BigDecimal;
 

src/main/java/org/qora/data/asset/TradeData.java

@@ -1,4 +1,4 @@
-package data.assets;
+package org.qora.data.asset;
 
 import java.math.BigDecimal;
 

src/main/java/org/qora/data/at/ATData.java

@@ -1,4 +1,4 @@
-package data.at;
+package org.qora.data.at;
 
 import java.math.BigDecimal;
 

src/main/java/org/qora/data/at/ATStateData.java

@@ -1,4 +1,4 @@
-package data.at;
+package org.qora.data.at;
 
 import java.math.BigDecimal;
 

src/main/java/org/qora/data/block/BlockData.java

@@ -1,9 +1,7 @@
-package data.block;
+package org.qora.data.block;
 
 import com.google.common.primitives.Bytes;
 
-import qora.crypto.Crypto;
-
 import java.io.Serializable;
 import java.math.BigDecimal;
 
@@ -11,6 +9,8 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 
+import org.qora.crypto.Crypto;
+
 // All properties to be converted to JSON via JAX-RS
 @XmlAccessorType(XmlAccessType.FIELD)
 public class BlockData implements Serializable {

src/main/java/org/qora/data/block/BlockTransactionData.java

@@ -1,4 +1,4 @@
-package data.block;
+package org.qora.data.block;
 
 public class BlockTransactionData {
 

src/main/java/org/qora/data/naming/NameData.java

@@ -1,4 +1,4 @@
-package data.naming;
+package org.qora.data.naming;
 
 import java.math.BigDecimal;
 

src/main/java/org/qora/data/package-info.java

@@ -3,13 +3,13 @@
 @XmlJavaTypeAdapters({
 	@XmlJavaTypeAdapter(
 		type = byte[].class,
-		value = api.Base58TypeAdapter.class
+		value = org.qora.api.Base58TypeAdapter.class
 	), @XmlJavaTypeAdapter(
 		type = java.math.BigDecimal.class,
-		value = api.BigDecimalTypeAdapter.class
+		value = org.qora.api.BigDecimalTypeAdapter.class
 	)
 })
-package data;
+package org.qora.data;
 
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters;

src/main/java/org/qora/data/transaction/ATTransactionData.java

@@ -1,13 +1,14 @@
-package data.transaction;
+package org.qora.data.transaction;
 
 import java.math.BigDecimal;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 
+import org.qora.account.GenesisAccount;
+import org.qora.transaction.Transaction.TransactionType;
+
 import io.swagger.v3.oas.annotations.media.Schema;
-import qora.account.GenesisAccount;
-import qora.transaction.Transaction.TransactionType;
 
 // All properties to be converted to JSON via JAX-RS
 @XmlAccessorType(XmlAccessType.FIELD)

src/main/java/org/qora/data/transaction/ArbitraryTransactionData.java

@@ -1,4 +1,4 @@
-package data.transaction;
+package org.qora.data.transaction;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -6,9 +6,10 @@ import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 
-import data.PaymentData;
+import org.qora.data.PaymentData;
+import org.qora.transaction.Transaction.TransactionType;
+
 import io.swagger.v3.oas.annotations.media.Schema;
-import qora.transaction.Transaction.TransactionType;
 
 // All properties to be converted to JSON via JAX-RS
 @XmlAccessorType(XmlAccessType.FIELD)

src/main/java/org/qora/data/transaction/BuyNameTransactionData.java

@@ -1,12 +1,13 @@
-package data.transaction;
+package org.qora.data.transaction;
 
 import java.math.BigDecimal;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 
+import org.qora.transaction.Transaction.TransactionType;
+
 import io.swagger.v3.oas.annotations.media.Schema;
-import qora.transaction.Transaction.TransactionType;
 
 // All properties to be converted to JSON via JAX-RS
 @XmlAccessorType(XmlAccessType.FIELD)

src/main/java/org/qora/data/transaction/CancelOrderTransactionData.java

@@ -1,12 +1,13 @@
-package data.transaction;
+package org.qora.data.transaction;
 
 import java.math.BigDecimal;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 
+import org.qora.transaction.Transaction;
+
 import io.swagger.v3.oas.annotations.media.Schema;
-import qora.transaction.Transaction;
 
 // All properties to be converted to JSON via JAX-RS
 @XmlAccessorType(XmlAccessType.FIELD)

src/main/java/org/qora/data/transaction/CancelSellNameTransactionData.java

@@ -1,12 +1,13 @@
-package data.transaction;
+package org.qora.data.transaction;
 
 import java.math.BigDecimal;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 
+import org.qora.transaction.Transaction.TransactionType;
+
 import io.swagger.v3.oas.annotations.media.Schema;
-import qora.transaction.Transaction.TransactionType;
 
 // All properties to be converted to JSON via JAX-RS
 @XmlAccessorType(XmlAccessType.FIELD)

src/main/java/org/qora/data/transaction/CreateOrderTransactionData.java

@@ -1,12 +1,13 @@
-package data.transaction;
+package org.qora.data.transaction;
 
 import java.math.BigDecimal;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 
+import org.qora.transaction.Transaction.TransactionType;
+
 import io.swagger.v3.oas.annotations.media.Schema;
-import qora.transaction.Transaction.TransactionType;
 
 // All properties to be converted to JSON via JAX-RS
 @XmlAccessorType(XmlAccessType.FIELD)

src/main/java/org/qora/data/transaction/CreatePollTransactionData.java

@@ -1,4 +1,4 @@
-package data.transaction;
+package org.qora.data.transaction;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -6,9 +6,10 @@ import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 
-import data.voting.PollOptionData;
+import org.qora.data.voting.PollOptionData;
+import org.qora.transaction.Transaction;
+
 import io.swagger.v3.oas.annotations.media.Schema;
-import qora.transaction.Transaction;
 
 // All properties to be converted to JSON via JAX-RS
 @XmlAccessorType(XmlAccessType.FIELD)

src/main/java/org/qora/data/transaction/DeployATTransactionData.java

@@ -1,12 +1,13 @@
-package data.transaction;
+package org.qora.data.transaction;
 
 import java.math.BigDecimal;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 
+import org.qora.transaction.Transaction.TransactionType;
+
 import io.swagger.v3.oas.annotations.media.Schema;
-import qora.transaction.Transaction.TransactionType;
 
 // All properties to be converted to JSON via JAX-RS
 @XmlAccessorType(XmlAccessType.FIELD)

src/main/java/org/qora/data/transaction/GenesisTransactionData.java

@@ -1,14 +1,15 @@
-package data.transaction;
+package org.qora.data.transaction;
 
 import java.math.BigDecimal;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 
+import org.qora.account.GenesisAccount;
+import org.qora.asset.Asset;
+import org.qora.transaction.Transaction.TransactionType;
+
 import io.swagger.v3.oas.annotations.media.Schema;
-import qora.account.GenesisAccount;
-import qora.assets.Asset;
-import qora.transaction.Transaction.TransactionType;
 
 // All properties to be converted to JSON via JAX-RS
 @XmlAccessorType(XmlAccessType.FIELD)

src/main/java/org/qora/data/transaction/IssueAssetTransactionData.java

@@ -1,13 +1,14 @@
-package data.transaction;
+package org.qora.data.transaction;
 
 import java.math.BigDecimal;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 
+import org.qora.transaction.Transaction.TransactionType;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema.AccessMode;
-import qora.transaction.Transaction.TransactionType;
 
 // All properties to be converted to JSON via JAX-RS
 @XmlAccessorType(XmlAccessType.FIELD)

src/main/java/org/qora/data/transaction/MessageTransactionData.java

@@ -1,13 +1,14 @@
-package data.transaction;
+package org.qora.data.transaction;
 
 import java.math.BigDecimal;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 
+import org.qora.asset.Asset;
+import org.qora.transaction.Transaction.TransactionType;
+
 import io.swagger.v3.oas.annotations.media.Schema;
-import qora.assets.Asset;
-import qora.transaction.Transaction.TransactionType;
 
 // All properties to be converted to JSON via JAX-RS
 @XmlAccessorType(XmlAccessType.FIELD)

src/main/java/org/qora/data/transaction/MultiPaymentTransactionData.java

@@ -1,4 +1,4 @@
-package data.transaction;
+package org.qora.data.transaction;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -6,9 +6,10 @@ import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 
-import data.PaymentData;
+import org.qora.data.PaymentData;
+import org.qora.transaction.Transaction;
+
 import io.swagger.v3.oas.annotations.media.Schema;
-import qora.transaction.Transaction;
 
 // All properties to be converted to JSON via JAX-RS
 @XmlAccessorType(XmlAccessType.FIELD)

src/main/java/org/qora/data/transaction/PaymentTransactionData.java

@@ -1,4 +1,4 @@
-package data.transaction;
+package org.qora.data.transaction;
 
 import java.math.BigDecimal;
 
@@ -6,8 +6,9 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
+import org.qora.transaction.Transaction.TransactionType;
+
 import io.swagger.v3.oas.annotations.media.Schema;
-import qora.transaction.Transaction.TransactionType;
 
 // All properties to be converted to JSON via JAX-RS
 @XmlAccessorType(XmlAccessType.FIELD)
@@ -22,7 +23,7 @@ public class PaymentTransactionData extends TransactionData {
 	@Schema(description = "amount to send", example = "123.456")
 	@XmlJavaTypeAdapter(
 			type = BigDecimal.class,
-			value = api.BigDecimalTypeAdapter.class
+			value = org.qora.api.BigDecimalTypeAdapter.class
 		)
 	private BigDecimal amount;
 

src/main/java/org/qora/data/transaction/RegisterNameTransactionData.java

@@ -1,12 +1,13 @@
-package data.transaction;
+package org.qora.data.transaction;
 
 import java.math.BigDecimal;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 
+import org.qora.transaction.Transaction.TransactionType;
+
 import io.swagger.v3.oas.annotations.media.Schema;
-import qora.transaction.Transaction.TransactionType;
 
 // All properties to be converted to JSON via JAX-RS
 @XmlAccessorType(XmlAccessType.FIELD)

src/main/java/org/qora/data/transaction/SellNameTransactionData.java

@@ -1,12 +1,13 @@
-package data.transaction;
+package org.qora.data.transaction;
 
 import java.math.BigDecimal;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 
+import org.qora.transaction.Transaction.TransactionType;
+
 import io.swagger.v3.oas.annotations.media.Schema;
-import qora.transaction.Transaction.TransactionType;
 
 // All properties to be converted to JSON via JAX-RS
 @XmlAccessorType(XmlAccessType.FIELD)

src/main/java/org/qora/data/transaction/TransactionData.java

@@ -1,4 +1,4 @@
-package data.transaction;
+package org.qora.data.transaction;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -11,12 +11,12 @@ import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlTransient;
 
 import org.eclipse.persistence.oxm.annotations.XmlClassExtractor;
+import org.qora.api.TransactionClassExtractor;
+import org.qora.crypto.Crypto;
+import org.qora.transaction.Transaction.TransactionType;
 
-import api.TransactionClassExtractor;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema.AccessMode;
-import qora.crypto.Crypto;
-import qora.transaction.Transaction.TransactionType;
 
 /*
  * If you encounter an error like:

src/main/java/org/qora/data/transaction/TransferAssetTransactionData.java

@@ -1,12 +1,13 @@
-package data.transaction;
+package org.qora.data.transaction;
 
 import java.math.BigDecimal;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 
+import org.qora.transaction.Transaction.TransactionType;
+
 import io.swagger.v3.oas.annotations.media.Schema;
-import qora.transaction.Transaction.TransactionType;
 
 // All properties to be converted to JSON via JAX-RS
 @XmlAccessorType(XmlAccessType.FIELD)

src/main/java/org/qora/data/transaction/UpdateNameTransactionData.java

@@ -1,12 +1,13 @@
-package data.transaction;
+package org.qora.data.transaction;
 
 import java.math.BigDecimal;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 
+import org.qora.transaction.Transaction.TransactionType;
+
 import io.swagger.v3.oas.annotations.media.Schema;
-import qora.transaction.Transaction.TransactionType;
 
 // All properties to be converted to JSON via JAX-RS
 @XmlAccessorType(XmlAccessType.FIELD)

src/main/java/org/qora/data/transaction/VoteOnPollTransactionData.java

@@ -1,12 +1,13 @@
-package data.transaction;
+package org.qora.data.transaction;
 
 import java.math.BigDecimal;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 
+import org.qora.transaction.Transaction.TransactionType;
+
 import io.swagger.v3.oas.annotations.media.Schema;
-import qora.transaction.Transaction.TransactionType;
 
 // All properties to be converted to JSON via JAX-RS
 @XmlAccessorType(XmlAccessType.FIELD)

src/main/java/org/qora/data/voting/PollData.java

@@ -1,8 +1,8 @@
-package data.voting;
+package org.qora.data.voting;
 
 import java.util.List;
 
-import data.voting.PollOptionData;
+import org.qora.data.voting.PollOptionData;
 
 public class PollData {
 

src/main/java/org/qora/data/voting/PollOptionData.java

@@ -1,4 +1,4 @@
-package data.voting;
+package org.qora.data.voting;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

src/main/java/org/qora/data/voting/VoteOnPollData.java

@@ -1,4 +1,4 @@
-package data.voting;
+package org.qora.data.voting;
 
 public class VoteOnPollData {
 

src/main/java/org/qora/globalization/BIP39WordList.java

@@ -1,4 +1,4 @@
-package globalization;
+package org.qora.globalization;
 
 import java.io.BufferedReader;
 import java.io.IOException;

src/main/java/org/qora/globalization/Translator.java

@@ -1,4 +1,4 @@
-package globalization;
+package org.qora.globalization;
 
 import java.util.HashMap;
 import java.util.Locale;

src/main/java/org/qora/naming/Name.java

@@ -1,17 +1,17 @@
-package qora.naming;
+package org.qora.naming;
 
-import data.naming.NameData;
-import data.transaction.BuyNameTransactionData;
-import data.transaction.CancelSellNameTransactionData;
-import data.transaction.RegisterNameTransactionData;
-import data.transaction.SellNameTransactionData;
-import data.transaction.TransactionData;
-import data.transaction.UpdateNameTransactionData;
-import qora.account.Account;
-import qora.account.PublicKeyAccount;
-import qora.assets.Asset;
-import repository.DataException;
-import repository.Repository;
+import org.qora.account.Account;
+import org.qora.account.PublicKeyAccount;
+import org.qora.asset.Asset;
+import org.qora.data.naming.NameData;
+import org.qora.data.transaction.BuyNameTransactionData;
+import org.qora.data.transaction.CancelSellNameTransactionData;
+import org.qora.data.transaction.RegisterNameTransactionData;
+import org.qora.data.transaction.SellNameTransactionData;
+import org.qora.data.transaction.TransactionData;
+import org.qora.data.transaction.UpdateNameTransactionData;
+import org.qora.repository.DataException;
+import org.qora.repository.Repository;
 
 public class Name {
 

src/main/java/org/qora/orphan.java

@@ -1,12 +1,13 @@
-import controller.Controller;
-import data.block.BlockData;
-import qora.block.Block;
-import qora.block.BlockChain;
-import repository.DataException;
-import repository.Repository;
-import repository.RepositoryFactory;
-import repository.RepositoryManager;
-import repository.hsqldb.HSQLDBRepositoryFactory;
+package org.qora;
+import org.qora.block.Block;
+import org.qora.block.BlockChain;
+import org.qora.controller.Controller;
+import org.qora.data.block.BlockData;
+import org.qora.repository.DataException;
+import org.qora.repository.Repository;
+import org.qora.repository.RepositoryFactory;
+import org.qora.repository.RepositoryManager;
+import org.qora.repository.hsqldb.HSQLDBRepositoryFactory;
 
 public class orphan {
 

src/main/java/org/qora/payment/Payment.java

@@ -1,4 +1,4 @@
-package qora.payment;
+package org.qora.payment;
 
 import java.math.BigDecimal;
 import java.util.Arrays;
@@ -8,17 +8,17 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import data.PaymentData;
-import data.assets.AssetData;
-import data.at.ATData;
-import qora.account.Account;
-import qora.account.PublicKeyAccount;
-import qora.assets.Asset;
-import qora.crypto.Crypto;
-import qora.transaction.Transaction.ValidationResult;
-import repository.AssetRepository;
-import repository.DataException;
-import repository.Repository;
+import org.qora.account.Account;
+import org.qora.account.PublicKeyAccount;
+import org.qora.asset.Asset;
+import org.qora.crypto.Crypto;
+import org.qora.data.PaymentData;
+import org.qora.data.asset.AssetData;
+import org.qora.data.at.ATData;
+import org.qora.repository.AssetRepository;
+import org.qora.repository.DataException;
+import org.qora.repository.Repository;
+import org.qora.transaction.Transaction.ValidationResult;
 
 public class Payment {
 

src/main/java/org/qora/repository/ATRepository.java

@@ -1,9 +1,9 @@
-package repository;
+package org.qora.repository;
 
 import java.util.List;
 
-import data.at.ATData;
-import data.at.ATStateData;
+import org.qora.data.at.ATData;
+import org.qora.data.at.ATStateData;
 
 public interface ATRepository {