diff --git a/backend/pom.xml b/backend/pom.xml
index 638bb50..6711818 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -152,7 +152,7 @@
                     <transformers>
                         <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
                         <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                            <mainClass>uk.co.neviyn.Observations.ObservationsApplication</mainClass>
+                            <mainClass>uk.co.neviyn.observations.ObservationsApplication</mainClass>
                         </transformer>
                     </transformers>
                 </configuration>
@@ -181,7 +181,7 @@
                         <argument>server</argument>
                         <argument>configuration.yml</argument>
                     </arguments>
-                    <mainClass>uk.co.neviyn.Observations.ObservationsApplication</mainClass>
+                    <mainClass>uk.co.neviyn.observations.ObservationsApplication</mainClass>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/backend/src/main/java/uk/co/neviyn/Observations/ObservationsApplication.java b/backend/src/main/java/uk/co/neviyn/observations/ObservationsApplication.java
similarity index 79%
rename from backend/src/main/java/uk/co/neviyn/Observations/ObservationsApplication.java
rename to backend/src/main/java/uk/co/neviyn/observations/ObservationsApplication.java
index 16eb017..6d6b2a4 100644
--- a/backend/src/main/java/uk/co/neviyn/Observations/ObservationsApplication.java
+++ b/backend/src/main/java/uk/co/neviyn/observations/ObservationsApplication.java
@@ -1,4 +1,4 @@
-package uk.co.neviyn.Observations;
+package uk.co.neviyn.observations;
 
 import io.dropwizard.Application;
 import io.dropwizard.assets.AssetsBundle;
@@ -10,17 +10,17 @@ import io.dropwizard.hibernate.HibernateBundle;
 import io.dropwizard.jersey.setup.JerseyEnvironment;
 import io.dropwizard.setup.Bootstrap;
 import io.dropwizard.setup.Environment;
-import uk.co.neviyn.Observations.auth.SimpleAuthenticator;
-import uk.co.neviyn.Observations.core.Observation;
-import uk.co.neviyn.Observations.core.Site;
-import uk.co.neviyn.Observations.core.Tutor;
-import uk.co.neviyn.Observations.core.User;
-import uk.co.neviyn.Observations.dao.ObservationDao;
-import uk.co.neviyn.Observations.dao.SiteDao;
-import uk.co.neviyn.Observations.dao.TutorDao;
-import uk.co.neviyn.Observations.resources.ObservationResource;
-import uk.co.neviyn.Observations.resources.SiteResource;
-import uk.co.neviyn.Observations.resources.TutorResource;
+import uk.co.neviyn.observations.auth.SimpleAuthenticator;
+import uk.co.neviyn.observations.core.Observation;
+import uk.co.neviyn.observations.core.Site;
+import uk.co.neviyn.observations.core.Tutor;
+import uk.co.neviyn.observations.core.User;
+import uk.co.neviyn.observations.dao.ObservationDao;
+import uk.co.neviyn.observations.dao.SiteDao;
+import uk.co.neviyn.observations.dao.TutorDao;
+import uk.co.neviyn.observations.resources.ObservationResource;
+import uk.co.neviyn.observations.resources.SiteResource;
+import uk.co.neviyn.observations.resources.TutorResource;
 
 public class ObservationsApplication extends Application<ObservationsConfiguration> {
 
diff --git a/backend/src/main/java/uk/co/neviyn/Observations/ObservationsConfiguration.java b/backend/src/main/java/uk/co/neviyn/observations/ObservationsConfiguration.java
similarity index 95%
rename from backend/src/main/java/uk/co/neviyn/Observations/ObservationsConfiguration.java
rename to backend/src/main/java/uk/co/neviyn/observations/ObservationsConfiguration.java
index 60d11df..31b61af 100644
--- a/backend/src/main/java/uk/co/neviyn/Observations/ObservationsConfiguration.java
+++ b/backend/src/main/java/uk/co/neviyn/observations/ObservationsConfiguration.java
@@ -1,4 +1,4 @@
-package uk.co.neviyn.Observations;
+package uk.co.neviyn.observations;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.dropwizard.Configuration;
diff --git a/backend/src/main/java/uk/co/neviyn/Observations/api/AverageStats.java b/backend/src/main/java/uk/co/neviyn/observations/api/AverageStats.java
similarity index 89%
rename from backend/src/main/java/uk/co/neviyn/Observations/api/AverageStats.java
rename to backend/src/main/java/uk/co/neviyn/observations/api/AverageStats.java
index a742645..9eba430 100644
--- a/backend/src/main/java/uk/co/neviyn/Observations/api/AverageStats.java
+++ b/backend/src/main/java/uk/co/neviyn/observations/api/AverageStats.java
@@ -1,4 +1,4 @@
-package uk.co.neviyn.Observations.api;
+package uk.co.neviyn.observations.api;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.*;
diff --git a/backend/src/main/java/uk/co/neviyn/Observations/api/AverageStatsChartJs.java b/backend/src/main/java/uk/co/neviyn/observations/api/AverageStatsChartJs.java
similarity index 94%
rename from backend/src/main/java/uk/co/neviyn/Observations/api/AverageStatsChartJs.java
rename to backend/src/main/java/uk/co/neviyn/observations/api/AverageStatsChartJs.java
index eb007a0..a6d7e41 100644
--- a/backend/src/main/java/uk/co/neviyn/Observations/api/AverageStatsChartJs.java
+++ b/backend/src/main/java/uk/co/neviyn/observations/api/AverageStatsChartJs.java
@@ -1,11 +1,10 @@
-package uk.co.neviyn.Observations.api;
+package uk.co.neviyn.observations.api;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.ArrayList;
 import java.util.List;
-import lombok.AllArgsConstructor;
+
 import lombok.Data;
-import lombok.NoArgsConstructor;
 import lombok.NonNull;
 
 /**
diff --git a/backend/src/main/java/uk/co/neviyn/Observations/api/NewObservation.java b/backend/src/main/java/uk/co/neviyn/observations/api/NewObservation.java
similarity index 85%
rename from backend/src/main/java/uk/co/neviyn/Observations/api/NewObservation.java
rename to backend/src/main/java/uk/co/neviyn/observations/api/NewObservation.java
index e86db3f..4dc3107 100644
--- a/backend/src/main/java/uk/co/neviyn/Observations/api/NewObservation.java
+++ b/backend/src/main/java/uk/co/neviyn/observations/api/NewObservation.java
@@ -1,8 +1,8 @@
-package uk.co.neviyn.Observations.api;
+package uk.co.neviyn.observations.api;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.*;
-import uk.co.neviyn.Observations.core.ObservationEntry;
+import uk.co.neviyn.observations.core.ObservationEntry;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/uk/co/neviyn/Observations/api/SelectOption.java b/backend/src/main/java/uk/co/neviyn/observations/api/SelectOption.java
similarity index 89%
rename from backend/src/main/java/uk/co/neviyn/Observations/api/SelectOption.java
rename to backend/src/main/java/uk/co/neviyn/observations/api/SelectOption.java
index 252d05d..d4fcc0d 100644
--- a/backend/src/main/java/uk/co/neviyn/Observations/api/SelectOption.java
+++ b/backend/src/main/java/uk/co/neviyn/observations/api/SelectOption.java
@@ -1,4 +1,4 @@
-package uk.co.neviyn.Observations.api;
+package uk.co.neviyn.observations.api;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
diff --git a/backend/src/main/java/uk/co/neviyn/Observations/auth/SimpleAuthenticator.java b/backend/src/main/java/uk/co/neviyn/observations/auth/SimpleAuthenticator.java
similarity index 88%
rename from backend/src/main/java/uk/co/neviyn/Observations/auth/SimpleAuthenticator.java
rename to backend/src/main/java/uk/co/neviyn/observations/auth/SimpleAuthenticator.java
index 2157cd5..ea8f058 100644
--- a/backend/src/main/java/uk/co/neviyn/Observations/auth/SimpleAuthenticator.java
+++ b/backend/src/main/java/uk/co/neviyn/observations/auth/SimpleAuthenticator.java
@@ -1,10 +1,10 @@
-package uk.co.neviyn.Observations.auth;
+package uk.co.neviyn.observations.auth;
 
 import io.dropwizard.auth.AuthenticationException;
 import io.dropwizard.auth.Authenticator;
 import io.dropwizard.auth.basic.BasicCredentials;
 import lombok.AllArgsConstructor;
-import uk.co.neviyn.Observations.core.User;
+import uk.co.neviyn.observations.core.User;
 
 import java.util.Optional;
 
diff --git a/backend/src/main/java/uk/co/neviyn/Observations/core/Observation.java b/backend/src/main/java/uk/co/neviyn/observations/core/Observation.java
similarity index 96%
rename from backend/src/main/java/uk/co/neviyn/Observations/core/Observation.java
rename to backend/src/main/java/uk/co/neviyn/observations/core/Observation.java
index 3c8a845..835ddaf 100644
--- a/backend/src/main/java/uk/co/neviyn/Observations/core/Observation.java
+++ b/backend/src/main/java/uk/co/neviyn/observations/core/Observation.java
@@ -1,4 +1,4 @@
-package uk.co.neviyn.Observations.core;
+package uk.co.neviyn.observations.core;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/backend/src/main/java/uk/co/neviyn/Observations/core/ObservationEntry.java b/backend/src/main/java/uk/co/neviyn/observations/core/ObservationEntry.java
similarity index 92%
rename from backend/src/main/java/uk/co/neviyn/Observations/core/ObservationEntry.java
rename to backend/src/main/java/uk/co/neviyn/observations/core/ObservationEntry.java
index df81b24..1c42e5b 100644
--- a/backend/src/main/java/uk/co/neviyn/Observations/core/ObservationEntry.java
+++ b/backend/src/main/java/uk/co/neviyn/observations/core/ObservationEntry.java
@@ -1,4 +1,4 @@
-package uk.co.neviyn.Observations.core;
+package uk.co.neviyn.observations.core;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.*;
diff --git a/backend/src/main/java/uk/co/neviyn/Observations/core/Site.java b/backend/src/main/java/uk/co/neviyn/observations/core/Site.java
similarity index 94%
rename from backend/src/main/java/uk/co/neviyn/Observations/core/Site.java
rename to backend/src/main/java/uk/co/neviyn/observations/core/Site.java
index 88af7f6..5f4c7f8 100644
--- a/backend/src/main/java/uk/co/neviyn/Observations/core/Site.java
+++ b/backend/src/main/java/uk/co/neviyn/observations/core/Site.java
@@ -1,4 +1,4 @@
-package uk.co.neviyn.Observations.core;
+package uk.co.neviyn.observations.core;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/backend/src/main/java/uk/co/neviyn/Observations/core/TrainingType.java b/backend/src/main/java/uk/co/neviyn/observations/core/TrainingType.java
similarity index 57%
rename from backend/src/main/java/uk/co/neviyn/Observations/core/TrainingType.java
rename to backend/src/main/java/uk/co/neviyn/observations/core/TrainingType.java
index 1672015..a799171 100644
--- a/backend/src/main/java/uk/co/neviyn/Observations/core/TrainingType.java
+++ b/backend/src/main/java/uk/co/neviyn/observations/core/TrainingType.java
@@ -1,4 +1,4 @@
-package uk.co.neviyn.Observations.core;
+package uk.co.neviyn.observations.core;
 
 public enum TrainingType {
     INITIAL, CONTINUING
diff --git a/backend/src/main/java/uk/co/neviyn/Observations/core/Tutor.java b/backend/src/main/java/uk/co/neviyn/observations/core/Tutor.java
similarity index 95%
rename from backend/src/main/java/uk/co/neviyn/Observations/core/Tutor.java
rename to backend/src/main/java/uk/co/neviyn/observations/core/Tutor.java
index 77e87a0..b71b9c2 100644
--- a/backend/src/main/java/uk/co/neviyn/Observations/core/Tutor.java
+++ b/backend/src/main/java/uk/co/neviyn/observations/core/Tutor.java
@@ -1,4 +1,4 @@
-package uk.co.neviyn.Observations.core;
+package uk.co.neviyn.observations.core;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/backend/src/main/java/uk/co/neviyn/Observations/core/User.java b/backend/src/main/java/uk/co/neviyn/observations/core/User.java
similarity index 85%
rename from backend/src/main/java/uk/co/neviyn/Observations/core/User.java
rename to backend/src/main/java/uk/co/neviyn/observations/core/User.java
index 8e9fd5d..b06e5b4 100644
--- a/backend/src/main/java/uk/co/neviyn/Observations/core/User.java
+++ b/backend/src/main/java/uk/co/neviyn/observations/core/User.java
@@ -1,4 +1,4 @@
-package uk.co.neviyn.Observations.core;
+package uk.co.neviyn.observations.core;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/backend/src/main/java/uk/co/neviyn/Observations/dao/ObservationDao.java b/backend/src/main/java/uk/co/neviyn/observations/dao/ObservationDao.java
similarity index 90%
rename from backend/src/main/java/uk/co/neviyn/Observations/dao/ObservationDao.java
rename to backend/src/main/java/uk/co/neviyn/observations/dao/ObservationDao.java
index c0d9744..73f53c9 100644
--- a/backend/src/main/java/uk/co/neviyn/Observations/dao/ObservationDao.java
+++ b/backend/src/main/java/uk/co/neviyn/observations/dao/ObservationDao.java
@@ -1,13 +1,13 @@
-package uk.co.neviyn.Observations.dao;
+package uk.co.neviyn.observations.dao;
 
 import io.dropwizard.hibernate.AbstractDAO;
 import org.hibernate.SessionFactory;
 import org.hibernate.query.Query;
 import org.joda.time.DateTime;
-import uk.co.neviyn.Observations.api.AverageStats;
-import uk.co.neviyn.Observations.core.Observation;
-import uk.co.neviyn.Observations.core.Site;
-import uk.co.neviyn.Observations.core.Tutor;
+import uk.co.neviyn.observations.api.AverageStats;
+import uk.co.neviyn.observations.core.Observation;
+import uk.co.neviyn.observations.core.Site;
+import uk.co.neviyn.observations.core.Tutor;
 
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
diff --git a/backend/src/main/java/uk/co/neviyn/Observations/dao/SiteDao.java b/backend/src/main/java/uk/co/neviyn/observations/dao/SiteDao.java
similarity index 85%
rename from backend/src/main/java/uk/co/neviyn/Observations/dao/SiteDao.java
rename to backend/src/main/java/uk/co/neviyn/observations/dao/SiteDao.java
index ed375da..cb75793 100644
--- a/backend/src/main/java/uk/co/neviyn/Observations/dao/SiteDao.java
+++ b/backend/src/main/java/uk/co/neviyn/observations/dao/SiteDao.java
@@ -1,8 +1,8 @@
-package uk.co.neviyn.Observations.dao;
+package uk.co.neviyn.observations.dao;
 
 import io.dropwizard.hibernate.AbstractDAO;
 import org.hibernate.SessionFactory;
-import uk.co.neviyn.Observations.core.Site;
+import uk.co.neviyn.observations.core.Site;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/uk/co/neviyn/Observations/dao/TutorDao.java b/backend/src/main/java/uk/co/neviyn/observations/dao/TutorDao.java
similarity index 85%
rename from backend/src/main/java/uk/co/neviyn/Observations/dao/TutorDao.java
rename to backend/src/main/java/uk/co/neviyn/observations/dao/TutorDao.java
index d57d587..73765b5 100644
--- a/backend/src/main/java/uk/co/neviyn/Observations/dao/TutorDao.java
+++ b/backend/src/main/java/uk/co/neviyn/observations/dao/TutorDao.java
@@ -1,8 +1,8 @@
-package uk.co.neviyn.Observations.dao;
+package uk.co.neviyn.observations.dao;
 
 import io.dropwizard.hibernate.AbstractDAO;
 import org.hibernate.SessionFactory;
-import uk.co.neviyn.Observations.core.Tutor;
+import uk.co.neviyn.observations.core.Tutor;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/uk/co/neviyn/Observations/resources/ObservationResource.java b/backend/src/main/java/uk/co/neviyn/observations/resources/ObservationResource.java
similarity index 84%
rename from backend/src/main/java/uk/co/neviyn/Observations/resources/ObservationResource.java
rename to backend/src/main/java/uk/co/neviyn/observations/resources/ObservationResource.java
index e96562f..4f4c746 100644
--- a/backend/src/main/java/uk/co/neviyn/Observations/resources/ObservationResource.java
+++ b/backend/src/main/java/uk/co/neviyn/observations/resources/ObservationResource.java
@@ -1,19 +1,19 @@
-package uk.co.neviyn.Observations.resources;
+package uk.co.neviyn.observations.resources;
 
 import io.dropwizard.hibernate.UnitOfWork;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
-import uk.co.neviyn.Observations.api.AverageStatsChartJs;
-import uk.co.neviyn.Observations.api.NewObservation;
-import uk.co.neviyn.Observations.core.Observation;
-import uk.co.neviyn.Observations.core.Site;
-import uk.co.neviyn.Observations.core.TrainingType;
-import uk.co.neviyn.Observations.core.Tutor;
-import uk.co.neviyn.Observations.dao.ObservationDao;
-import uk.co.neviyn.Observations.dao.SiteDao;
-import uk.co.neviyn.Observations.dao.TutorDao;
+import uk.co.neviyn.observations.api.AverageStatsChartJs;
+import uk.co.neviyn.observations.api.NewObservation;
+import uk.co.neviyn.observations.core.Observation;
+import uk.co.neviyn.observations.core.Site;
+import uk.co.neviyn.observations.core.TrainingType;
+import uk.co.neviyn.observations.core.Tutor;
+import uk.co.neviyn.observations.dao.ObservationDao;
+import uk.co.neviyn.observations.dao.SiteDao;
+import uk.co.neviyn.observations.dao.TutorDao;
 
 import javax.validation.constraints.NotNull;
 import javax.ws.rs.*;
diff --git a/backend/src/main/java/uk/co/neviyn/Observations/resources/SiteResource.java b/backend/src/main/java/uk/co/neviyn/observations/resources/SiteResource.java
similarity index 82%
rename from backend/src/main/java/uk/co/neviyn/Observations/resources/SiteResource.java
rename to backend/src/main/java/uk/co/neviyn/observations/resources/SiteResource.java
index e3a6268..87dfcaa 100644
--- a/backend/src/main/java/uk/co/neviyn/Observations/resources/SiteResource.java
+++ b/backend/src/main/java/uk/co/neviyn/observations/resources/SiteResource.java
@@ -1,13 +1,13 @@
-package uk.co.neviyn.Observations.resources;
+package uk.co.neviyn.observations.resources;
 
 import io.dropwizard.auth.Auth;
 import io.dropwizard.hibernate.UnitOfWork;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import uk.co.neviyn.Observations.api.SelectOption;
-import uk.co.neviyn.Observations.core.Site;
-import uk.co.neviyn.Observations.core.User;
-import uk.co.neviyn.Observations.dao.SiteDao;
+import uk.co.neviyn.observations.api.SelectOption;
+import uk.co.neviyn.observations.core.Site;
+import uk.co.neviyn.observations.core.User;
+import uk.co.neviyn.observations.dao.SiteDao;
 
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
diff --git a/backend/src/main/java/uk/co/neviyn/Observations/resources/TutorResource.java b/backend/src/main/java/uk/co/neviyn/observations/resources/TutorResource.java
similarity index 83%
rename from backend/src/main/java/uk/co/neviyn/Observations/resources/TutorResource.java
rename to backend/src/main/java/uk/co/neviyn/observations/resources/TutorResource.java
index 51c72e2..4970322 100644
--- a/backend/src/main/java/uk/co/neviyn/Observations/resources/TutorResource.java
+++ b/backend/src/main/java/uk/co/neviyn/observations/resources/TutorResource.java
@@ -1,4 +1,4 @@
-package uk.co.neviyn.Observations.resources;
+package uk.co.neviyn.observations.resources;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.dropwizard.auth.Auth;
@@ -8,12 +8,12 @@ import lombok.NoArgsConstructor;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import uk.co.neviyn.Observations.core.Observation;
-import uk.co.neviyn.Observations.core.Site;
-import uk.co.neviyn.Observations.core.Tutor;
-import uk.co.neviyn.Observations.core.User;
-import uk.co.neviyn.Observations.dao.SiteDao;
-import uk.co.neviyn.Observations.dao.TutorDao;
+import uk.co.neviyn.observations.core.Observation;
+import uk.co.neviyn.observations.core.Site;
+import uk.co.neviyn.observations.core.Tutor;
+import uk.co.neviyn.observations.core.User;
+import uk.co.neviyn.observations.dao.SiteDao;
+import uk.co.neviyn.observations.dao.TutorDao;
 
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
diff --git a/backend/src/test/java/uk/co/neviyn/Observations/api/NewObservationTest.java b/backend/src/test/java/uk/co/neviyn/observations/api/NewObservationTest.java
similarity index 92%
rename from backend/src/test/java/uk/co/neviyn/Observations/api/NewObservationTest.java
rename to backend/src/test/java/uk/co/neviyn/observations/api/NewObservationTest.java
index ad6f122..4cfc91b 100644
--- a/backend/src/test/java/uk/co/neviyn/Observations/api/NewObservationTest.java
+++ b/backend/src/test/java/uk/co/neviyn/observations/api/NewObservationTest.java
@@ -1,9 +1,9 @@
-package uk.co.neviyn.Observations.api;
+package uk.co.neviyn.observations.api;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.dropwizard.jackson.Jackson;
 import org.junit.Test;
-import uk.co.neviyn.Observations.core.ObservationEntry;
+import uk.co.neviyn.observations.core.ObservationEntry;
 
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/backend/src/test/java/uk/co/neviyn/Observations/core/ObservationTest.java b/backend/src/test/java/uk/co/neviyn/observations/core/ObservationTest.java
similarity index 96%
rename from backend/src/test/java/uk/co/neviyn/Observations/core/ObservationTest.java
rename to backend/src/test/java/uk/co/neviyn/observations/core/ObservationTest.java
index cfce1fa..ce2e472 100644
--- a/backend/src/test/java/uk/co/neviyn/Observations/core/ObservationTest.java
+++ b/backend/src/test/java/uk/co/neviyn/observations/core/ObservationTest.java
@@ -1,4 +1,4 @@
-package uk.co.neviyn.Observations.core;
+package uk.co.neviyn.observations.core;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.dropwizard.jackson.Jackson;
diff --git a/backend/src/test/java/uk/co/neviyn/Observations/dao/DaoTestBase.java b/backend/src/test/java/uk/co/neviyn/observations/dao/DaoTestBase.java
similarity index 60%
rename from backend/src/test/java/uk/co/neviyn/Observations/dao/DaoTestBase.java
rename to backend/src/test/java/uk/co/neviyn/observations/dao/DaoTestBase.java
index 5135cd3..10238d2 100644
--- a/backend/src/test/java/uk/co/neviyn/Observations/dao/DaoTestBase.java
+++ b/backend/src/test/java/uk/co/neviyn/observations/dao/DaoTestBase.java
@@ -1,10 +1,10 @@
-package uk.co.neviyn.Observations.dao;
+package uk.co.neviyn.observations.dao;
 
 import io.dropwizard.testing.junit.DAOTestRule;
 import org.junit.Rule;
-import uk.co.neviyn.Observations.core.Observation;
-import uk.co.neviyn.Observations.core.Site;
-import uk.co.neviyn.Observations.core.Tutor;
+import uk.co.neviyn.observations.core.Observation;
+import uk.co.neviyn.observations.core.Site;
+import uk.co.neviyn.observations.core.Tutor;
 
 public abstract class DaoTestBase {
   @Rule
diff --git a/backend/src/test/java/uk/co/neviyn/Observations/dao/ObservationDaoTest.java b/backend/src/test/java/uk/co/neviyn/observations/dao/ObservationDaoTest.java
similarity index 96%
rename from backend/src/test/java/uk/co/neviyn/Observations/dao/ObservationDaoTest.java
rename to backend/src/test/java/uk/co/neviyn/observations/dao/ObservationDaoTest.java
index 4aef3ea..aa3d4e2 100644
--- a/backend/src/test/java/uk/co/neviyn/Observations/dao/ObservationDaoTest.java
+++ b/backend/src/test/java/uk/co/neviyn/observations/dao/ObservationDaoTest.java
@@ -1,14 +1,14 @@
-package uk.co.neviyn.Observations.dao;
+package uk.co.neviyn.observations.dao;
 
 import org.apache.commons.lang3.SerializationUtils;
 import org.joda.time.DateTime;
 import org.junit.Before;
 import org.junit.Test;
-import uk.co.neviyn.Observations.api.AverageStats;
-import uk.co.neviyn.Observations.core.Observation;
-import uk.co.neviyn.Observations.core.ObservationEntry;
-import uk.co.neviyn.Observations.core.Site;
-import uk.co.neviyn.Observations.core.TrainingType;
+import uk.co.neviyn.observations.api.AverageStats;
+import uk.co.neviyn.observations.core.Observation;
+import uk.co.neviyn.observations.core.ObservationEntry;
+import uk.co.neviyn.observations.core.Site;
+import uk.co.neviyn.observations.core.TrainingType;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/backend/src/test/java/uk/co/neviyn/Observations/dao/SiteDaoTest.java b/backend/src/test/java/uk/co/neviyn/observations/dao/SiteDaoTest.java
similarity index 92%
rename from backend/src/test/java/uk/co/neviyn/Observations/dao/SiteDaoTest.java
rename to backend/src/test/java/uk/co/neviyn/observations/dao/SiteDaoTest.java
index 007f367..aa6f89e 100644
--- a/backend/src/test/java/uk/co/neviyn/Observations/dao/SiteDaoTest.java
+++ b/backend/src/test/java/uk/co/neviyn/observations/dao/SiteDaoTest.java
@@ -1,8 +1,8 @@
-package uk.co.neviyn.Observations.dao;
+package uk.co.neviyn.observations.dao;
 
 import org.junit.Before;
 import org.junit.Test;
-import uk.co.neviyn.Observations.core.Site;
+import uk.co.neviyn.observations.core.Site;
 
 import java.util.List;
 
diff --git a/backend/src/test/java/uk/co/neviyn/Observations/dao/TutorDaoTest.java b/backend/src/test/java/uk/co/neviyn/observations/dao/TutorDaoTest.java
similarity index 91%
rename from backend/src/test/java/uk/co/neviyn/Observations/dao/TutorDaoTest.java
rename to backend/src/test/java/uk/co/neviyn/observations/dao/TutorDaoTest.java
index d17be1a..9786ae7 100644
--- a/backend/src/test/java/uk/co/neviyn/Observations/dao/TutorDaoTest.java
+++ b/backend/src/test/java/uk/co/neviyn/observations/dao/TutorDaoTest.java
@@ -1,9 +1,9 @@
-package uk.co.neviyn.Observations.dao;
+package uk.co.neviyn.observations.dao;
 
 import org.junit.Before;
 import org.junit.Test;
-import uk.co.neviyn.Observations.core.Site;
-import uk.co.neviyn.Observations.core.Tutor;
+import uk.co.neviyn.observations.core.Site;
+import uk.co.neviyn.observations.core.Tutor;
 
 import java.util.List;
 
diff --git a/backend/src/test/java/uk/co/neviyn/Observations/resources/ObservationResourceTest.java b/backend/src/test/java/uk/co/neviyn/observations/resources/ObservationResourceTest.java
similarity index 83%
rename from backend/src/test/java/uk/co/neviyn/Observations/resources/ObservationResourceTest.java
rename to backend/src/test/java/uk/co/neviyn/observations/resources/ObservationResourceTest.java
index f4373df..11b789f 100644
--- a/backend/src/test/java/uk/co/neviyn/Observations/resources/ObservationResourceTest.java
+++ b/backend/src/test/java/uk/co/neviyn/observations/resources/ObservationResourceTest.java
@@ -1,16 +1,16 @@
-package uk.co.neviyn.Observations.resources;
+package uk.co.neviyn.observations.resources;
 
 import io.dropwizard.testing.junit.ResourceTestRule;
 import org.junit.After;
 import org.junit.ClassRule;
 import org.junit.Test;
-import uk.co.neviyn.Observations.api.NewObservation;
-import uk.co.neviyn.Observations.core.Observation;
-import uk.co.neviyn.Observations.core.Site;
-import uk.co.neviyn.Observations.core.Tutor;
-import uk.co.neviyn.Observations.dao.ObservationDao;
-import uk.co.neviyn.Observations.dao.SiteDao;
-import uk.co.neviyn.Observations.dao.TutorDao;
+import uk.co.neviyn.observations.api.NewObservation;
+import uk.co.neviyn.observations.core.Observation;
+import uk.co.neviyn.observations.core.Site;
+import uk.co.neviyn.observations.core.Tutor;
+import uk.co.neviyn.observations.dao.ObservationDao;
+import uk.co.neviyn.observations.dao.SiteDao;
+import uk.co.neviyn.observations.dao.TutorDao;
 
 import javax.ws.rs.client.Entity;
 import java.util.ArrayList;
diff --git a/backend/src/test/java/uk/co/neviyn/Observations/resources/SiteResourceTest.java b/backend/src/test/java/uk/co/neviyn/observations/resources/SiteResourceTest.java
similarity index 87%
rename from backend/src/test/java/uk/co/neviyn/Observations/resources/SiteResourceTest.java
rename to backend/src/test/java/uk/co/neviyn/observations/resources/SiteResourceTest.java
index bb07552..2b92632 100644
--- a/backend/src/test/java/uk/co/neviyn/Observations/resources/SiteResourceTest.java
+++ b/backend/src/test/java/uk/co/neviyn/observations/resources/SiteResourceTest.java
@@ -1,4 +1,4 @@
-package uk.co.neviyn.Observations.resources;
+package uk.co.neviyn.observations.resources;
 
 import io.dropwizard.auth.AuthDynamicFeature;
 import io.dropwizard.auth.AuthValueFactoryProvider;
@@ -7,12 +7,12 @@ import io.dropwizard.testing.junit.ResourceTestRule;
 import org.junit.After;
 import org.junit.ClassRule;
 import org.junit.Test;
-import uk.co.neviyn.Observations.api.SelectOption;
-import uk.co.neviyn.Observations.auth.SimpleAuthenticator;
-import uk.co.neviyn.Observations.core.Site;
-import uk.co.neviyn.Observations.core.Tutor;
-import uk.co.neviyn.Observations.core.User;
-import uk.co.neviyn.Observations.dao.SiteDao;
+import uk.co.neviyn.observations.api.SelectOption;
+import uk.co.neviyn.observations.auth.SimpleAuthenticator;
+import uk.co.neviyn.observations.core.Site;
+import uk.co.neviyn.observations.core.Tutor;
+import uk.co.neviyn.observations.core.User;
+import uk.co.neviyn.observations.dao.SiteDao;
 
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.core.GenericType;
diff --git a/backend/src/test/java/uk/co/neviyn/Observations/resources/TutorResourceTest.java b/backend/src/test/java/uk/co/neviyn/observations/resources/TutorResourceTest.java
similarity index 86%
rename from backend/src/test/java/uk/co/neviyn/Observations/resources/TutorResourceTest.java
rename to backend/src/test/java/uk/co/neviyn/observations/resources/TutorResourceTest.java
index bb8a48b..a2ed6ed 100644
--- a/backend/src/test/java/uk/co/neviyn/Observations/resources/TutorResourceTest.java
+++ b/backend/src/test/java/uk/co/neviyn/observations/resources/TutorResourceTest.java
@@ -1,4 +1,4 @@
-package uk.co.neviyn.Observations.resources;
+package uk.co.neviyn.observations.resources;
 
 import io.dropwizard.auth.AuthDynamicFeature;
 import io.dropwizard.auth.AuthValueFactoryProvider;
@@ -7,12 +7,12 @@ import io.dropwizard.testing.junit.ResourceTestRule;
 import org.junit.After;
 import org.junit.ClassRule;
 import org.junit.Test;
-import uk.co.neviyn.Observations.auth.SimpleAuthenticator;
-import uk.co.neviyn.Observations.core.Site;
-import uk.co.neviyn.Observations.core.Tutor;
-import uk.co.neviyn.Observations.core.User;
-import uk.co.neviyn.Observations.dao.SiteDao;
-import uk.co.neviyn.Observations.dao.TutorDao;
+import uk.co.neviyn.observations.auth.SimpleAuthenticator;
+import uk.co.neviyn.observations.core.Site;
+import uk.co.neviyn.observations.core.Tutor;
+import uk.co.neviyn.observations.core.User;
+import uk.co.neviyn.observations.dao.SiteDao;
+import uk.co.neviyn.observations.dao.TutorDao;
 
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.core.GenericType;