diff --git a/src/main/java/org/leolo/nrdatad/App.java b/src/main/java/org/leolo/nrdatad/App.java
index 4665cb3..2292666 100644
--- a/src/main/java/org/leolo/nrdatad/App.java
+++ b/src/main/java/org/leolo/nrdatad/App.java
@@ -5,7 +5,7 @@ import org.apache.commons.cli.*;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.leolo.nrdatad.db.DatabaseManager;
-import org.leolo.nrdatad.org.leolo.nrdatad.cron.ReferenceDataJob;
+import org.leolo.nrdatad.cron.ReferenceDataJob;
 import org.quartz.*;
 import org.quartz.impl.StdSchedulerFactory;
 
diff --git a/src/main/java/org/leolo/nrdatad/org/leolo/nrdatad/cron/ReferenceDataJob.java b/src/main/java/org/leolo/nrdatad/cron/ReferenceDataJob.java
similarity index 94%
rename from src/main/java/org/leolo/nrdatad/org/leolo/nrdatad/cron/ReferenceDataJob.java
rename to src/main/java/org/leolo/nrdatad/cron/ReferenceDataJob.java
index b9dbc04..bfa46ff 100644
--- a/src/main/java/org/leolo/nrdatad/org/leolo/nrdatad/cron/ReferenceDataJob.java
+++ b/src/main/java/org/leolo/nrdatad/cron/ReferenceDataJob.java
@@ -1,4 +1,4 @@
-package org.leolo.nrdatad.org.leolo.nrdatad.cron;
+package org.leolo.nrdatad.cron;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -7,8 +7,8 @@ import org.json.JSONObject;
 import org.leolo.nrdatad.ConfigurationManager;
 import org.leolo.nrdatad.Constants;
 import org.leolo.nrdatad.db.CORPUSDao;
-import org.leolo.nrdatad.org.leolo.nrdatad.model.CORPUS;
-import org.leolo.nrdatad.org.leolo.nrdatad.util.HttpUtil;
+import org.leolo.nrdatad.model.CORPUS;
+import org.leolo.nrdatad.util.HttpUtil;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
diff --git a/src/main/java/org/leolo/nrdatad/db/CORPUSDao.java b/src/main/java/org/leolo/nrdatad/db/CORPUSDao.java
index 6e60e7e..8fab54e 100644
--- a/src/main/java/org/leolo/nrdatad/db/CORPUSDao.java
+++ b/src/main/java/org/leolo/nrdatad/db/CORPUSDao.java
@@ -1,6 +1,6 @@
 package org.leolo.nrdatad.db;
 
-import org.leolo.nrdatad.org.leolo.nrdatad.model.CORPUS;
+import org.leolo.nrdatad.model.CORPUS;
 
 import java.sql.SQLException;
 import java.util.Collection;
diff --git a/src/main/java/org/leolo/nrdatad/db/mariadb/CORPUSDao.java b/src/main/java/org/leolo/nrdatad/db/mariadb/CORPUSDao.java
index 75550bd..badcc3e 100644
--- a/src/main/java/org/leolo/nrdatad/db/mariadb/CORPUSDao.java
+++ b/src/main/java/org/leolo/nrdatad/db/mariadb/CORPUSDao.java
@@ -4,7 +4,7 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 import org.leolo.nrdatad.db.DatabaseManager;
-import org.leolo.nrdatad.org.leolo.nrdatad.model.CORPUS;
+import org.leolo.nrdatad.model.CORPUS;
 
 import java.sql.*;
 import java.util.Collection;
diff --git a/src/main/java/org/leolo/nrdatad/org/leolo/nrdatad/model/CORPUS.java b/src/main/java/org/leolo/nrdatad/model/CORPUS.java
similarity index 97%
rename from src/main/java/org/leolo/nrdatad/org/leolo/nrdatad/model/CORPUS.java
rename to src/main/java/org/leolo/nrdatad/model/CORPUS.java
index 0b84652..7106ba7 100644
--- a/src/main/java/org/leolo/nrdatad/org/leolo/nrdatad/model/CORPUS.java
+++ b/src/main/java/org/leolo/nrdatad/model/CORPUS.java
@@ -1,4 +1,4 @@
-package org.leolo.nrdatad.org.leolo.nrdatad.model;
+package org.leolo.nrdatad.model;
 
 import java.util.Objects;
 
diff --git a/src/main/java/org/leolo/nrdatad/org/leolo/nrdatad/util/HttpUtil.java b/src/main/java/org/leolo/nrdatad/util/HttpUtil.java
similarity index 97%
rename from src/main/java/org/leolo/nrdatad/org/leolo/nrdatad/util/HttpUtil.java
rename to src/main/java/org/leolo/nrdatad/util/HttpUtil.java
index c4ae852..a9a9fa1 100644
--- a/src/main/java/org/leolo/nrdatad/org/leolo/nrdatad/util/HttpUtil.java
+++ b/src/main/java/org/leolo/nrdatad/util/HttpUtil.java
@@ -1,4 +1,4 @@
-package org.leolo.nrdatad.org.leolo.nrdatad.util;
+package org.leolo.nrdatad.util;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;