diff --git a/src/main/java/ctbrec/io/ModelJsonAdapter.java b/src/main/java/ctbrec/io/ModelJsonAdapter.java
index 38cae4f5..6254461e 100644
--- a/src/main/java/ctbrec/io/ModelJsonAdapter.java
+++ b/src/main/java/ctbrec/io/ModelJsonAdapter.java
@@ -7,8 +7,8 @@ import com.squareup.moshi.JsonAdapter;
 import com.squareup.moshi.JsonReader;
 import com.squareup.moshi.JsonReader.Token;
 
-import ctbrec.ChaturbateModel;
 import ctbrec.Model;
+import ctbrec.sites.chaturbate.ChaturbateModel;
 
 import com.squareup.moshi.JsonWriter;
 
diff --git a/src/main/java/ctbrec/recorder/LocalRecorder.java b/src/main/java/ctbrec/recorder/LocalRecorder.java
index d5bbc971..6cb03866 100644
--- a/src/main/java/ctbrec/recorder/LocalRecorder.java
+++ b/src/main/java/ctbrec/recorder/LocalRecorder.java
@@ -27,16 +27,16 @@ import org.slf4j.LoggerFactory;
 import com.iheartradio.m3u8.ParseException;
 import com.iheartradio.m3u8.PlaylistException;
 
-import ctbrec.ChaturbateModel;
 import ctbrec.Config;
 import ctbrec.Model;
-import ctbrec.ModelParser;
 import ctbrec.Recording;
 import ctbrec.io.HttpClient;
 import ctbrec.recorder.PlaylistGenerator.InvalidPlaylistException;
 import ctbrec.recorder.download.Download;
 import ctbrec.recorder.download.HlsDownload;
 import ctbrec.recorder.download.MergedHlsDownload;
+import ctbrec.sites.chaturbate.ChaturbateModel;
+import ctbrec.sites.chaturbate.ModelParser;
 import okhttp3.Request;
 import okhttp3.Response;
 
diff --git a/src/main/java/ctbrec/recorder/server/RecorderServlet.java b/src/main/java/ctbrec/recorder/server/RecorderServlet.java
index 347a9db5..58d4e9cf 100644
--- a/src/main/java/ctbrec/recorder/server/RecorderServlet.java
+++ b/src/main/java/ctbrec/recorder/server/RecorderServlet.java
@@ -20,12 +20,12 @@ import org.slf4j.LoggerFactory;
 import com.squareup.moshi.JsonAdapter;
 import com.squareup.moshi.Moshi;
 
-import ctbrec.ChaturbateModel;
 import ctbrec.Model;
 import ctbrec.Recording;
 import ctbrec.io.InstantJsonAdapter;
 import ctbrec.io.ModelJsonAdapter;
 import ctbrec.recorder.Recorder;
+import ctbrec.sites.chaturbate.ChaturbateModel;
 
 public class RecorderServlet extends AbstractCtbrecServlet {
 
diff --git a/src/main/java/ctbrec/ChaturbateModel.java b/src/main/java/ctbrec/sites/chaturbate/ChaturbateModel.java
similarity index 99%
rename from src/main/java/ctbrec/ChaturbateModel.java
rename to src/main/java/ctbrec/sites/chaturbate/ChaturbateModel.java
index e2d26690..c4070143 100644
--- a/src/main/java/ctbrec/ChaturbateModel.java
+++ b/src/main/java/ctbrec/sites/chaturbate/ChaturbateModel.java
@@ -1,4 +1,4 @@
-package ctbrec;
+package ctbrec.sites.chaturbate;
 
 import java.io.EOFException;
 import java.io.IOException;
@@ -26,8 +26,8 @@ import com.iheartradio.m3u8.data.PlaylistData;
 import com.squareup.moshi.JsonAdapter;
 import com.squareup.moshi.Moshi;
 
+import ctbrec.AbstractModel;
 import ctbrec.io.HttpClient;
-import ctbrec.recorder.StreamInfo;
 import ctbrec.recorder.download.StreamSource;
 import okhttp3.FormBody;
 import okhttp3.Request;
diff --git a/src/main/java/ctbrec/ModelParser.java b/src/main/java/ctbrec/sites/chaturbate/ModelParser.java
similarity index 97%
rename from src/main/java/ctbrec/ModelParser.java
rename to src/main/java/ctbrec/sites/chaturbate/ModelParser.java
index dc16dd89..f67726a0 100644
--- a/src/main/java/ctbrec/ModelParser.java
+++ b/src/main/java/ctbrec/sites/chaturbate/ModelParser.java
@@ -1,4 +1,4 @@
-package ctbrec;
+package ctbrec.sites.chaturbate;
 
 import static ctbrec.ui.CtbrecApplication.BASE_URI;
 
diff --git a/src/main/java/ctbrec/recorder/StreamInfo.java b/src/main/java/ctbrec/sites/chaturbate/StreamInfo.java
similarity index 81%
rename from src/main/java/ctbrec/recorder/StreamInfo.java
rename to src/main/java/ctbrec/sites/chaturbate/StreamInfo.java
index 740074fa..285ea6c2 100644
--- a/src/main/java/ctbrec/recorder/StreamInfo.java
+++ b/src/main/java/ctbrec/sites/chaturbate/StreamInfo.java
@@ -1,4 +1,4 @@
-package ctbrec.recorder;
+package ctbrec.sites.chaturbate;
 
 public class StreamInfo {
     public String url;
diff --git a/src/main/java/ctbrec/ui/RecordedModelsTab.java b/src/main/java/ctbrec/ui/RecordedModelsTab.java
index 1726bb2c..245e9f2c 100644
--- a/src/main/java/ctbrec/ui/RecordedModelsTab.java
+++ b/src/main/java/ctbrec/ui/RecordedModelsTab.java
@@ -18,10 +18,10 @@ import java.util.function.Function;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import ctbrec.ChaturbateModel;
 import ctbrec.Model;
 import ctbrec.io.HttpClient;
 import ctbrec.recorder.Recorder;
+import ctbrec.sites.chaturbate.ChaturbateModel;
 import javafx.application.Platform;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
diff --git a/src/main/java/ctbrec/ui/RecordingsTab.java b/src/main/java/ctbrec/ui/RecordingsTab.java
index fc13cc56..44613752 100644
--- a/src/main/java/ctbrec/ui/RecordingsTab.java
+++ b/src/main/java/ctbrec/ui/RecordingsTab.java
@@ -29,12 +29,12 @@ import com.iheartradio.m3u8.ParseException;
 import com.iheartradio.m3u8.PlaylistException;
 
 import ctbrec.Config;
-import ctbrec.ChaturbateModel;
 import ctbrec.Recording;
 import ctbrec.Recording.STATUS;
 import ctbrec.io.HttpClient;
 import ctbrec.recorder.Recorder;
 import ctbrec.recorder.download.MergedHlsDownload;
+import ctbrec.sites.chaturbate.ChaturbateModel;
 import javafx.application.Platform;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.collections.FXCollections;
diff --git a/src/main/java/ctbrec/ui/ThumbCell.java b/src/main/java/ctbrec/ui/ThumbCell.java
index de943107..a18dae85 100644
--- a/src/main/java/ctbrec/ui/ThumbCell.java
+++ b/src/main/java/ctbrec/ui/ThumbCell.java
@@ -8,12 +8,12 @@ import java.util.function.Function;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import ctbrec.ChaturbateModel;
 import ctbrec.Config;
 import ctbrec.Model;
 import ctbrec.io.HttpClient;
 import ctbrec.recorder.Recorder;
-import ctbrec.recorder.StreamInfo;
+import ctbrec.sites.chaturbate.ChaturbateModel;
+import ctbrec.sites.chaturbate.StreamInfo;
 import javafx.animation.FadeTransition;
 import javafx.animation.FillTransition;
 import javafx.animation.ParallelTransition;
diff --git a/src/main/java/ctbrec/ui/ThumbOverviewTab.java b/src/main/java/ctbrec/ui/ThumbOverviewTab.java
index f7723fc5..404b26fb 100644
--- a/src/main/java/ctbrec/ui/ThumbOverviewTab.java
+++ b/src/main/java/ctbrec/ui/ThumbOverviewTab.java
@@ -28,10 +28,10 @@ import org.slf4j.LoggerFactory;
 import com.sun.javafx.collections.ObservableListWrapper;
 
 import ctbrec.Config;
-import ctbrec.ChaturbateModel;
-import ctbrec.ModelParser;
 import ctbrec.io.HttpClient;
 import ctbrec.recorder.Recorder;
+import ctbrec.sites.chaturbate.ChaturbateModel;
+import ctbrec.sites.chaturbate.ModelParser;
 import javafx.collections.ObservableList;
 import javafx.concurrent.ScheduledService;
 import javafx.concurrent.Task;