diff --git a/data-access/servlet/src/main/java/soda/Soda.java b/data-access/servlet/src/main/java/common/Soda.java similarity index 100% rename from data-access/servlet/src/main/java/soda/Soda.java rename to data-access/servlet/src/main/java/common/Soda.java diff --git a/data-access/servlet/src/main/java/soda/SodaImpl.java b/data-access/servlet/src/main/java/common/SodaImpl.java similarity index 100% rename from data-access/servlet/src/main/java/soda/SodaImpl.java rename to data-access/servlet/src/main/java/common/SodaImpl.java diff --git a/data-access/servlet/src/main/java/soda/webapi/ServletCutout.java b/data-access/servlet/src/main/java/cutout/webapi/ServletCutout.java similarity index 100% rename from data-access/servlet/src/main/java/soda/webapi/ServletCutout.java rename to data-access/servlet/src/main/java/cutout/webapi/ServletCutout.java diff --git a/data-access/servlet/src/main/java/soda/webapi/Settings.java b/data-access/servlet/src/main/java/cutout/webapi/Settings.java similarity index 100% rename from data-access/servlet/src/main/java/soda/webapi/Settings.java rename to data-access/servlet/src/main/java/cutout/webapi/Settings.java