From 05d583bab55a50022e1236d2773c2625bd5ffd1e Mon Sep 17 00:00:00 2001 From: 0xboobface <0xboobface@gmail.com> Date: Sun, 18 Nov 2018 22:49:05 +0100 Subject: [PATCH] Change folder structure to maven conventions --- client/pom.xml | 37 ------------------- common/.classpath | 14 ++++++- .../org.eclipse.core.resources.prefs | 2 + common/pom.xml | 5 +++ .../{ => main/java}/ctbrec/AbstractModel.java | 0 common/src/{ => main/java}/ctbrec/Config.java | 0 common/src/{ => main/java}/ctbrec/Hmac.java | 0 common/src/{ => main/java}/ctbrec/Java.java | 0 .../java}/ctbrec/LoggingInterceptor.java | 0 common/src/{ => main/java}/ctbrec/Model.java | 0 common/src/{ => main/java}/ctbrec/OS.java | 0 .../src/{ => main/java}/ctbrec/Recording.java | 0 .../src/{ => main/java}/ctbrec/Settings.java | 0 .../{ => main/java}/ctbrec/StringUtil.java | 0 .../src/{ => main/java}/ctbrec/Version.java | 0 .../ctbrec/io/CookieContainerJsonAdapter.java | 0 .../java}/ctbrec/io/CookieJarImpl.java | 0 .../java}/ctbrec/io/CookieJsonAdapter.java | 0 .../{ => main/java}/ctbrec/io/DevNull.java | 0 .../{ => main/java}/ctbrec/io/HtmlParser.java | 0 .../{ => main/java}/ctbrec/io/HttpClient.java | 0 .../java}/ctbrec/io/HttpException.java | 0 .../java}/ctbrec/io/InstantJsonAdapter.java | 0 .../java}/ctbrec/io/ModelJsonAdapter.java | 0 .../java}/ctbrec/io/StreamRedirectThread.java | 0 .../java}/ctbrec/recorder/LocalRecorder.java | 0 .../ctbrec/recorder/PlaylistGenerator.java | 0 .../ctbrec/recorder/ProgressListener.java | 0 .../java}/ctbrec/recorder/Recorder.java | 0 .../ctbrec/recorder/RecorderHttpClient.java | 0 .../java}/ctbrec/recorder/RemoteRecorder.java | 0 .../download/AbstractHlsDownload.java | 0 .../ctbrec/recorder/download/Download.java | 0 .../ctbrec/recorder/download/HlsDownload.java | 0 .../recorder/download/MergedHlsDownload.java | 0 .../recorder/download/StreamSource.java | 0 .../java}/ctbrec/sites/AbstractSite.java | 0 .../java}/ctbrec/sites/ConfigUI.java | 0 .../sites/NeedsManualLoginException.java | 0 .../{ => main/java}/ctbrec/sites/Site.java | 0 .../java}/ctbrec/sites/bonga/BongaCams.java | 0 .../sites/bonga/BongaCamsHttpClient.java | 0 .../ctbrec/sites/bonga/BongaCamsModel.java | 0 .../java}/ctbrec/sites/cam4/Cam4.java | 0 .../ctbrec/sites/cam4/Cam4HttpClient.java | 0 .../java}/ctbrec/sites/cam4/Cam4Model.java | 0 .../java}/ctbrec/sites/camsoda/Camsoda.java | 0 .../sites/camsoda/CamsodaHttpClient.java | 0 .../ctbrec/sites/camsoda/CamsodaModel.java | 0 .../ctbrec/sites/chaturbate/Chaturbate.java | 0 .../chaturbate/ChaturbateHttpClient.java | 0 .../sites/chaturbate/ChaturbateModel.java | 0 .../chaturbate/ChaturbateModelParser.java | 0 .../ctbrec/sites/chaturbate/StreamInfo.java | 0 .../java}/ctbrec/sites/mfc/Fcext.java | 0 .../java}/ctbrec/sites/mfc/Message.java | 0 .../java}/ctbrec/sites/mfc/MessageTypes.java | 0 .../java}/ctbrec/sites/mfc/Model.java | 0 .../java}/ctbrec/sites/mfc/MyFreeCams.java | 0 .../ctbrec/sites/mfc/MyFreeCamsClient.java | 0 .../sites/mfc/MyFreeCamsHttpClient.java | 0 .../ctbrec/sites/mfc/MyFreeCamsModel.java | 0 .../java}/ctbrec/sites/mfc/ServerConfig.java | 0 .../java}/ctbrec/sites/mfc/SessionState.java | 0 .../java}/ctbrec/sites/mfc/Share.java | 0 .../java}/ctbrec/sites/mfc/State.java | 0 .../java}/ctbrec/sites/mfc/User.java | 0 .../{ => main/java}/ctbrec/sites/mfc/X.java | 0 .../{ => main/java}/org/taktik/CHANGELOG.md | 0 .../java}/org/taktik/ioutils/NIOUtils.java | 0 .../java}/org/taktik/mpegts/Constants.java | 0 .../java}/org/taktik/mpegts/MTSPacket.java | 0 .../java}/org/taktik/mpegts/Merger.java | 0 .../java}/org/taktik/mpegts/PATSection.java | 0 .../java}/org/taktik/mpegts/PMTSection.java | 0 .../java}/org/taktik/mpegts/PSISection.java | 0 .../org/taktik/mpegts/PacketSupport.java | 0 .../java}/org/taktik/mpegts/Streamer.java | 0 .../java}/org/taktik/mpegts/StreamerTest.java | 0 .../taktik/mpegts/sinks/ByteChannelSink.java | 0 .../org/taktik/mpegts/sinks/MTSSink.java | 0 .../org/taktik/mpegts/sinks/UDPTransport.java | 0 .../sources/AbstractByteChannelMTSSource.java | 0 .../mpegts/sources/AbstractMTSSource.java | 0 .../sources/BlockingMultiMTSSource.java | 0 .../mpegts/sources/ByteChannelMTSSource.java | 0 .../mpegts/sources/ByteSourceMTSSource.java | 0 .../sources/ConcatenatingMTSSource.java | 0 .../mpegts/sources/ContinuityFixer.java | 0 .../sources/ContinuityFixingMTSSource.java | 0 .../mpegts/sources/FixedBitrateMTSSource.java | 0 .../mpegts/sources/InputStreamMTSSource.java | 0 .../mpegts/sources/LoopingMTSSource.java | 0 .../org/taktik/mpegts/sources/MTSSource.java | 0 .../org/taktik/mpegts/sources/MTSSources.java | 0 .../mpegts/sources/MultiplexingMTSSource.java | 0 .../mpegts/sources/NullPacketSource.java | 0 .../mpegts/sources/ResettableMTSSource.java | 0 .../sources/SeekableByteChannelMTSSource.java | 0 .../src/test/java/ctbrec/VersionTest.java | 0 100 files changed, 20 insertions(+), 38 deletions(-) rename common/src/{ => main/java}/ctbrec/AbstractModel.java (100%) rename common/src/{ => main/java}/ctbrec/Config.java (100%) rename common/src/{ => main/java}/ctbrec/Hmac.java (100%) rename common/src/{ => main/java}/ctbrec/Java.java (100%) rename common/src/{ => main/java}/ctbrec/LoggingInterceptor.java (100%) rename common/src/{ => main/java}/ctbrec/Model.java (100%) rename common/src/{ => main/java}/ctbrec/OS.java (100%) rename common/src/{ => main/java}/ctbrec/Recording.java (100%) rename common/src/{ => main/java}/ctbrec/Settings.java (100%) rename common/src/{ => main/java}/ctbrec/StringUtil.java (100%) rename common/src/{ => main/java}/ctbrec/Version.java (100%) rename common/src/{ => main/java}/ctbrec/io/CookieContainerJsonAdapter.java (100%) rename common/src/{ => main/java}/ctbrec/io/CookieJarImpl.java (100%) rename common/src/{ => main/java}/ctbrec/io/CookieJsonAdapter.java (100%) rename common/src/{ => main/java}/ctbrec/io/DevNull.java (100%) rename common/src/{ => main/java}/ctbrec/io/HtmlParser.java (100%) rename common/src/{ => main/java}/ctbrec/io/HttpClient.java (100%) rename common/src/{ => main/java}/ctbrec/io/HttpException.java (100%) rename common/src/{ => main/java}/ctbrec/io/InstantJsonAdapter.java (100%) rename common/src/{ => main/java}/ctbrec/io/ModelJsonAdapter.java (100%) rename common/src/{ => main/java}/ctbrec/io/StreamRedirectThread.java (100%) rename common/src/{ => main/java}/ctbrec/recorder/LocalRecorder.java (100%) rename common/src/{ => main/java}/ctbrec/recorder/PlaylistGenerator.java (100%) rename common/src/{ => main/java}/ctbrec/recorder/ProgressListener.java (100%) rename common/src/{ => main/java}/ctbrec/recorder/Recorder.java (100%) rename common/src/{ => main/java}/ctbrec/recorder/RecorderHttpClient.java (100%) rename common/src/{ => main/java}/ctbrec/recorder/RemoteRecorder.java (100%) rename common/src/{ => main/java}/ctbrec/recorder/download/AbstractHlsDownload.java (100%) rename common/src/{ => main/java}/ctbrec/recorder/download/Download.java (100%) rename common/src/{ => main/java}/ctbrec/recorder/download/HlsDownload.java (100%) rename common/src/{ => main/java}/ctbrec/recorder/download/MergedHlsDownload.java (100%) rename common/src/{ => main/java}/ctbrec/recorder/download/StreamSource.java (100%) rename common/src/{ => main/java}/ctbrec/sites/AbstractSite.java (100%) rename common/src/{ => main/java}/ctbrec/sites/ConfigUI.java (100%) rename common/src/{ => main/java}/ctbrec/sites/NeedsManualLoginException.java (100%) rename common/src/{ => main/java}/ctbrec/sites/Site.java (100%) rename common/src/{ => main/java}/ctbrec/sites/bonga/BongaCams.java (100%) rename common/src/{ => main/java}/ctbrec/sites/bonga/BongaCamsHttpClient.java (100%) rename common/src/{ => main/java}/ctbrec/sites/bonga/BongaCamsModel.java (100%) rename common/src/{ => main/java}/ctbrec/sites/cam4/Cam4.java (100%) rename common/src/{ => main/java}/ctbrec/sites/cam4/Cam4HttpClient.java (100%) rename common/src/{ => main/java}/ctbrec/sites/cam4/Cam4Model.java (100%) rename common/src/{ => main/java}/ctbrec/sites/camsoda/Camsoda.java (100%) rename common/src/{ => main/java}/ctbrec/sites/camsoda/CamsodaHttpClient.java (100%) rename common/src/{ => main/java}/ctbrec/sites/camsoda/CamsodaModel.java (100%) rename common/src/{ => main/java}/ctbrec/sites/chaturbate/Chaturbate.java (100%) rename common/src/{ => main/java}/ctbrec/sites/chaturbate/ChaturbateHttpClient.java (100%) rename common/src/{ => main/java}/ctbrec/sites/chaturbate/ChaturbateModel.java (100%) rename common/src/{ => main/java}/ctbrec/sites/chaturbate/ChaturbateModelParser.java (100%) rename common/src/{ => main/java}/ctbrec/sites/chaturbate/StreamInfo.java (100%) rename common/src/{ => main/java}/ctbrec/sites/mfc/Fcext.java (100%) rename common/src/{ => main/java}/ctbrec/sites/mfc/Message.java (100%) rename common/src/{ => main/java}/ctbrec/sites/mfc/MessageTypes.java (100%) rename common/src/{ => main/java}/ctbrec/sites/mfc/Model.java (100%) rename common/src/{ => main/java}/ctbrec/sites/mfc/MyFreeCams.java (100%) rename common/src/{ => main/java}/ctbrec/sites/mfc/MyFreeCamsClient.java (100%) rename common/src/{ => main/java}/ctbrec/sites/mfc/MyFreeCamsHttpClient.java (100%) rename common/src/{ => main/java}/ctbrec/sites/mfc/MyFreeCamsModel.java (100%) rename common/src/{ => main/java}/ctbrec/sites/mfc/ServerConfig.java (100%) rename common/src/{ => main/java}/ctbrec/sites/mfc/SessionState.java (100%) rename common/src/{ => main/java}/ctbrec/sites/mfc/Share.java (100%) rename common/src/{ => main/java}/ctbrec/sites/mfc/State.java (100%) rename common/src/{ => main/java}/ctbrec/sites/mfc/User.java (100%) rename common/src/{ => main/java}/ctbrec/sites/mfc/X.java (100%) rename common/src/{ => main/java}/org/taktik/CHANGELOG.md (100%) rename common/src/{ => main/java}/org/taktik/ioutils/NIOUtils.java (100%) rename common/src/{ => main/java}/org/taktik/mpegts/Constants.java (100%) rename common/src/{ => main/java}/org/taktik/mpegts/MTSPacket.java (100%) rename common/src/{ => main/java}/org/taktik/mpegts/Merger.java (100%) rename common/src/{ => main/java}/org/taktik/mpegts/PATSection.java (100%) rename common/src/{ => main/java}/org/taktik/mpegts/PMTSection.java (100%) rename common/src/{ => main/java}/org/taktik/mpegts/PSISection.java (100%) rename common/src/{ => main/java}/org/taktik/mpegts/PacketSupport.java (100%) rename common/src/{ => main/java}/org/taktik/mpegts/Streamer.java (100%) rename common/src/{ => main/java}/org/taktik/mpegts/StreamerTest.java (100%) rename common/src/{ => main/java}/org/taktik/mpegts/sinks/ByteChannelSink.java (100%) rename common/src/{ => main/java}/org/taktik/mpegts/sinks/MTSSink.java (100%) rename common/src/{ => main/java}/org/taktik/mpegts/sinks/UDPTransport.java (100%) rename common/src/{ => main/java}/org/taktik/mpegts/sources/AbstractByteChannelMTSSource.java (100%) rename common/src/{ => main/java}/org/taktik/mpegts/sources/AbstractMTSSource.java (100%) rename common/src/{ => main/java}/org/taktik/mpegts/sources/BlockingMultiMTSSource.java (100%) rename common/src/{ => main/java}/org/taktik/mpegts/sources/ByteChannelMTSSource.java (100%) rename common/src/{ => main/java}/org/taktik/mpegts/sources/ByteSourceMTSSource.java (100%) rename common/src/{ => main/java}/org/taktik/mpegts/sources/ConcatenatingMTSSource.java (100%) rename common/src/{ => main/java}/org/taktik/mpegts/sources/ContinuityFixer.java (100%) rename common/src/{ => main/java}/org/taktik/mpegts/sources/ContinuityFixingMTSSource.java (100%) rename common/src/{ => main/java}/org/taktik/mpegts/sources/FixedBitrateMTSSource.java (100%) rename common/src/{ => main/java}/org/taktik/mpegts/sources/InputStreamMTSSource.java (100%) rename common/src/{ => main/java}/org/taktik/mpegts/sources/LoopingMTSSource.java (100%) rename common/src/{ => main/java}/org/taktik/mpegts/sources/MTSSource.java (100%) rename common/src/{ => main/java}/org/taktik/mpegts/sources/MTSSources.java (100%) rename common/src/{ => main/java}/org/taktik/mpegts/sources/MultiplexingMTSSource.java (100%) rename common/src/{ => main/java}/org/taktik/mpegts/sources/NullPacketSource.java (100%) rename common/src/{ => main/java}/org/taktik/mpegts/sources/ResettableMTSSource.java (100%) rename common/src/{ => main/java}/org/taktik/mpegts/sources/SeekableByteChannelMTSSource.java (100%) rename {client => common}/src/test/java/ctbrec/VersionTest.java (100%) diff --git a/client/pom.xml b/client/pom.xml index 0c12d37b..75e4bef0 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -69,39 +69,11 @@ ctbrec common - - org.jsoup - jsoup - - - com.squareup.okhttp3 - okhttp - - - com.squareup.moshi - moshi - - - org.json - json - - - org.slf4j - slf4j-api - ch.qos.logback logback-classic runtime - - com.iheartradio.m3u8 - open-m3u8 - - - org.jcodec - jcodec - org.openjfx javafx-controls @@ -110,15 +82,6 @@ org.openjfx javafx-web - - com.google.guava - guava - - - junit - junit - test - diff --git a/common/.classpath b/common/.classpath index e1b830e8..3c5e7d17 100644 --- a/common/.classpath +++ b/common/.classpath @@ -1,15 +1,27 @@ + + + + + + - + + + + + + + diff --git a/common/.settings/org.eclipse.core.resources.prefs b/common/.settings/org.eclipse.core.resources.prefs index 99f26c02..f9fe3459 100644 --- a/common/.settings/org.eclipse.core.resources.prefs +++ b/common/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,4 @@ eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/test/java=UTF-8 encoding/=UTF-8 diff --git a/common/pom.xml b/common/pom.xml index 1ffda026..e628c20e 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -60,6 +60,11 @@ javafx-web provided + + junit + junit + test + diff --git a/common/src/ctbrec/AbstractModel.java b/common/src/main/java/ctbrec/AbstractModel.java similarity index 100% rename from common/src/ctbrec/AbstractModel.java rename to common/src/main/java/ctbrec/AbstractModel.java diff --git a/common/src/ctbrec/Config.java b/common/src/main/java/ctbrec/Config.java similarity index 100% rename from common/src/ctbrec/Config.java rename to common/src/main/java/ctbrec/Config.java diff --git a/common/src/ctbrec/Hmac.java b/common/src/main/java/ctbrec/Hmac.java similarity index 100% rename from common/src/ctbrec/Hmac.java rename to common/src/main/java/ctbrec/Hmac.java diff --git a/common/src/ctbrec/Java.java b/common/src/main/java/ctbrec/Java.java similarity index 100% rename from common/src/ctbrec/Java.java rename to common/src/main/java/ctbrec/Java.java diff --git a/common/src/ctbrec/LoggingInterceptor.java b/common/src/main/java/ctbrec/LoggingInterceptor.java similarity index 100% rename from common/src/ctbrec/LoggingInterceptor.java rename to common/src/main/java/ctbrec/LoggingInterceptor.java diff --git a/common/src/ctbrec/Model.java b/common/src/main/java/ctbrec/Model.java similarity index 100% rename from common/src/ctbrec/Model.java rename to common/src/main/java/ctbrec/Model.java diff --git a/common/src/ctbrec/OS.java b/common/src/main/java/ctbrec/OS.java similarity index 100% rename from common/src/ctbrec/OS.java rename to common/src/main/java/ctbrec/OS.java diff --git a/common/src/ctbrec/Recording.java b/common/src/main/java/ctbrec/Recording.java similarity index 100% rename from common/src/ctbrec/Recording.java rename to common/src/main/java/ctbrec/Recording.java diff --git a/common/src/ctbrec/Settings.java b/common/src/main/java/ctbrec/Settings.java similarity index 100% rename from common/src/ctbrec/Settings.java rename to common/src/main/java/ctbrec/Settings.java diff --git a/common/src/ctbrec/StringUtil.java b/common/src/main/java/ctbrec/StringUtil.java similarity index 100% rename from common/src/ctbrec/StringUtil.java rename to common/src/main/java/ctbrec/StringUtil.java diff --git a/common/src/ctbrec/Version.java b/common/src/main/java/ctbrec/Version.java similarity index 100% rename from common/src/ctbrec/Version.java rename to common/src/main/java/ctbrec/Version.java diff --git a/common/src/ctbrec/io/CookieContainerJsonAdapter.java b/common/src/main/java/ctbrec/io/CookieContainerJsonAdapter.java similarity index 100% rename from common/src/ctbrec/io/CookieContainerJsonAdapter.java rename to common/src/main/java/ctbrec/io/CookieContainerJsonAdapter.java diff --git a/common/src/ctbrec/io/CookieJarImpl.java b/common/src/main/java/ctbrec/io/CookieJarImpl.java similarity index 100% rename from common/src/ctbrec/io/CookieJarImpl.java rename to common/src/main/java/ctbrec/io/CookieJarImpl.java diff --git a/common/src/ctbrec/io/CookieJsonAdapter.java b/common/src/main/java/ctbrec/io/CookieJsonAdapter.java similarity index 100% rename from common/src/ctbrec/io/CookieJsonAdapter.java rename to common/src/main/java/ctbrec/io/CookieJsonAdapter.java diff --git a/common/src/ctbrec/io/DevNull.java b/common/src/main/java/ctbrec/io/DevNull.java similarity index 100% rename from common/src/ctbrec/io/DevNull.java rename to common/src/main/java/ctbrec/io/DevNull.java diff --git a/common/src/ctbrec/io/HtmlParser.java b/common/src/main/java/ctbrec/io/HtmlParser.java similarity index 100% rename from common/src/ctbrec/io/HtmlParser.java rename to common/src/main/java/ctbrec/io/HtmlParser.java diff --git a/common/src/ctbrec/io/HttpClient.java b/common/src/main/java/ctbrec/io/HttpClient.java similarity index 100% rename from common/src/ctbrec/io/HttpClient.java rename to common/src/main/java/ctbrec/io/HttpClient.java diff --git a/common/src/ctbrec/io/HttpException.java b/common/src/main/java/ctbrec/io/HttpException.java similarity index 100% rename from common/src/ctbrec/io/HttpException.java rename to common/src/main/java/ctbrec/io/HttpException.java diff --git a/common/src/ctbrec/io/InstantJsonAdapter.java b/common/src/main/java/ctbrec/io/InstantJsonAdapter.java similarity index 100% rename from common/src/ctbrec/io/InstantJsonAdapter.java rename to common/src/main/java/ctbrec/io/InstantJsonAdapter.java diff --git a/common/src/ctbrec/io/ModelJsonAdapter.java b/common/src/main/java/ctbrec/io/ModelJsonAdapter.java similarity index 100% rename from common/src/ctbrec/io/ModelJsonAdapter.java rename to common/src/main/java/ctbrec/io/ModelJsonAdapter.java diff --git a/common/src/ctbrec/io/StreamRedirectThread.java b/common/src/main/java/ctbrec/io/StreamRedirectThread.java similarity index 100% rename from common/src/ctbrec/io/StreamRedirectThread.java rename to common/src/main/java/ctbrec/io/StreamRedirectThread.java diff --git a/common/src/ctbrec/recorder/LocalRecorder.java b/common/src/main/java/ctbrec/recorder/LocalRecorder.java similarity index 100% rename from common/src/ctbrec/recorder/LocalRecorder.java rename to common/src/main/java/ctbrec/recorder/LocalRecorder.java diff --git a/common/src/ctbrec/recorder/PlaylistGenerator.java b/common/src/main/java/ctbrec/recorder/PlaylistGenerator.java similarity index 100% rename from common/src/ctbrec/recorder/PlaylistGenerator.java rename to common/src/main/java/ctbrec/recorder/PlaylistGenerator.java diff --git a/common/src/ctbrec/recorder/ProgressListener.java b/common/src/main/java/ctbrec/recorder/ProgressListener.java similarity index 100% rename from common/src/ctbrec/recorder/ProgressListener.java rename to common/src/main/java/ctbrec/recorder/ProgressListener.java diff --git a/common/src/ctbrec/recorder/Recorder.java b/common/src/main/java/ctbrec/recorder/Recorder.java similarity index 100% rename from common/src/ctbrec/recorder/Recorder.java rename to common/src/main/java/ctbrec/recorder/Recorder.java diff --git a/common/src/ctbrec/recorder/RecorderHttpClient.java b/common/src/main/java/ctbrec/recorder/RecorderHttpClient.java similarity index 100% rename from common/src/ctbrec/recorder/RecorderHttpClient.java rename to common/src/main/java/ctbrec/recorder/RecorderHttpClient.java diff --git a/common/src/ctbrec/recorder/RemoteRecorder.java b/common/src/main/java/ctbrec/recorder/RemoteRecorder.java similarity index 100% rename from common/src/ctbrec/recorder/RemoteRecorder.java rename to common/src/main/java/ctbrec/recorder/RemoteRecorder.java diff --git a/common/src/ctbrec/recorder/download/AbstractHlsDownload.java b/common/src/main/java/ctbrec/recorder/download/AbstractHlsDownload.java similarity index 100% rename from common/src/ctbrec/recorder/download/AbstractHlsDownload.java rename to common/src/main/java/ctbrec/recorder/download/AbstractHlsDownload.java diff --git a/common/src/ctbrec/recorder/download/Download.java b/common/src/main/java/ctbrec/recorder/download/Download.java similarity index 100% rename from common/src/ctbrec/recorder/download/Download.java rename to common/src/main/java/ctbrec/recorder/download/Download.java diff --git a/common/src/ctbrec/recorder/download/HlsDownload.java b/common/src/main/java/ctbrec/recorder/download/HlsDownload.java similarity index 100% rename from common/src/ctbrec/recorder/download/HlsDownload.java rename to common/src/main/java/ctbrec/recorder/download/HlsDownload.java diff --git a/common/src/ctbrec/recorder/download/MergedHlsDownload.java b/common/src/main/java/ctbrec/recorder/download/MergedHlsDownload.java similarity index 100% rename from common/src/ctbrec/recorder/download/MergedHlsDownload.java rename to common/src/main/java/ctbrec/recorder/download/MergedHlsDownload.java diff --git a/common/src/ctbrec/recorder/download/StreamSource.java b/common/src/main/java/ctbrec/recorder/download/StreamSource.java similarity index 100% rename from common/src/ctbrec/recorder/download/StreamSource.java rename to common/src/main/java/ctbrec/recorder/download/StreamSource.java diff --git a/common/src/ctbrec/sites/AbstractSite.java b/common/src/main/java/ctbrec/sites/AbstractSite.java similarity index 100% rename from common/src/ctbrec/sites/AbstractSite.java rename to common/src/main/java/ctbrec/sites/AbstractSite.java diff --git a/common/src/ctbrec/sites/ConfigUI.java b/common/src/main/java/ctbrec/sites/ConfigUI.java similarity index 100% rename from common/src/ctbrec/sites/ConfigUI.java rename to common/src/main/java/ctbrec/sites/ConfigUI.java diff --git a/common/src/ctbrec/sites/NeedsManualLoginException.java b/common/src/main/java/ctbrec/sites/NeedsManualLoginException.java similarity index 100% rename from common/src/ctbrec/sites/NeedsManualLoginException.java rename to common/src/main/java/ctbrec/sites/NeedsManualLoginException.java diff --git a/common/src/ctbrec/sites/Site.java b/common/src/main/java/ctbrec/sites/Site.java similarity index 100% rename from common/src/ctbrec/sites/Site.java rename to common/src/main/java/ctbrec/sites/Site.java diff --git a/common/src/ctbrec/sites/bonga/BongaCams.java b/common/src/main/java/ctbrec/sites/bonga/BongaCams.java similarity index 100% rename from common/src/ctbrec/sites/bonga/BongaCams.java rename to common/src/main/java/ctbrec/sites/bonga/BongaCams.java diff --git a/common/src/ctbrec/sites/bonga/BongaCamsHttpClient.java b/common/src/main/java/ctbrec/sites/bonga/BongaCamsHttpClient.java similarity index 100% rename from common/src/ctbrec/sites/bonga/BongaCamsHttpClient.java rename to common/src/main/java/ctbrec/sites/bonga/BongaCamsHttpClient.java diff --git a/common/src/ctbrec/sites/bonga/BongaCamsModel.java b/common/src/main/java/ctbrec/sites/bonga/BongaCamsModel.java similarity index 100% rename from common/src/ctbrec/sites/bonga/BongaCamsModel.java rename to common/src/main/java/ctbrec/sites/bonga/BongaCamsModel.java diff --git a/common/src/ctbrec/sites/cam4/Cam4.java b/common/src/main/java/ctbrec/sites/cam4/Cam4.java similarity index 100% rename from common/src/ctbrec/sites/cam4/Cam4.java rename to common/src/main/java/ctbrec/sites/cam4/Cam4.java diff --git a/common/src/ctbrec/sites/cam4/Cam4HttpClient.java b/common/src/main/java/ctbrec/sites/cam4/Cam4HttpClient.java similarity index 100% rename from common/src/ctbrec/sites/cam4/Cam4HttpClient.java rename to common/src/main/java/ctbrec/sites/cam4/Cam4HttpClient.java diff --git a/common/src/ctbrec/sites/cam4/Cam4Model.java b/common/src/main/java/ctbrec/sites/cam4/Cam4Model.java similarity index 100% rename from common/src/ctbrec/sites/cam4/Cam4Model.java rename to common/src/main/java/ctbrec/sites/cam4/Cam4Model.java diff --git a/common/src/ctbrec/sites/camsoda/Camsoda.java b/common/src/main/java/ctbrec/sites/camsoda/Camsoda.java similarity index 100% rename from common/src/ctbrec/sites/camsoda/Camsoda.java rename to common/src/main/java/ctbrec/sites/camsoda/Camsoda.java diff --git a/common/src/ctbrec/sites/camsoda/CamsodaHttpClient.java b/common/src/main/java/ctbrec/sites/camsoda/CamsodaHttpClient.java similarity index 100% rename from common/src/ctbrec/sites/camsoda/CamsodaHttpClient.java rename to common/src/main/java/ctbrec/sites/camsoda/CamsodaHttpClient.java diff --git a/common/src/ctbrec/sites/camsoda/CamsodaModel.java b/common/src/main/java/ctbrec/sites/camsoda/CamsodaModel.java similarity index 100% rename from common/src/ctbrec/sites/camsoda/CamsodaModel.java rename to common/src/main/java/ctbrec/sites/camsoda/CamsodaModel.java diff --git a/common/src/ctbrec/sites/chaturbate/Chaturbate.java b/common/src/main/java/ctbrec/sites/chaturbate/Chaturbate.java similarity index 100% rename from common/src/ctbrec/sites/chaturbate/Chaturbate.java rename to common/src/main/java/ctbrec/sites/chaturbate/Chaturbate.java diff --git a/common/src/ctbrec/sites/chaturbate/ChaturbateHttpClient.java b/common/src/main/java/ctbrec/sites/chaturbate/ChaturbateHttpClient.java similarity index 100% rename from common/src/ctbrec/sites/chaturbate/ChaturbateHttpClient.java rename to common/src/main/java/ctbrec/sites/chaturbate/ChaturbateHttpClient.java diff --git a/common/src/ctbrec/sites/chaturbate/ChaturbateModel.java b/common/src/main/java/ctbrec/sites/chaturbate/ChaturbateModel.java similarity index 100% rename from common/src/ctbrec/sites/chaturbate/ChaturbateModel.java rename to common/src/main/java/ctbrec/sites/chaturbate/ChaturbateModel.java diff --git a/common/src/ctbrec/sites/chaturbate/ChaturbateModelParser.java b/common/src/main/java/ctbrec/sites/chaturbate/ChaturbateModelParser.java similarity index 100% rename from common/src/ctbrec/sites/chaturbate/ChaturbateModelParser.java rename to common/src/main/java/ctbrec/sites/chaturbate/ChaturbateModelParser.java diff --git a/common/src/ctbrec/sites/chaturbate/StreamInfo.java b/common/src/main/java/ctbrec/sites/chaturbate/StreamInfo.java similarity index 100% rename from common/src/ctbrec/sites/chaturbate/StreamInfo.java rename to common/src/main/java/ctbrec/sites/chaturbate/StreamInfo.java diff --git a/common/src/ctbrec/sites/mfc/Fcext.java b/common/src/main/java/ctbrec/sites/mfc/Fcext.java similarity index 100% rename from common/src/ctbrec/sites/mfc/Fcext.java rename to common/src/main/java/ctbrec/sites/mfc/Fcext.java diff --git a/common/src/ctbrec/sites/mfc/Message.java b/common/src/main/java/ctbrec/sites/mfc/Message.java similarity index 100% rename from common/src/ctbrec/sites/mfc/Message.java rename to common/src/main/java/ctbrec/sites/mfc/Message.java diff --git a/common/src/ctbrec/sites/mfc/MessageTypes.java b/common/src/main/java/ctbrec/sites/mfc/MessageTypes.java similarity index 100% rename from common/src/ctbrec/sites/mfc/MessageTypes.java rename to common/src/main/java/ctbrec/sites/mfc/MessageTypes.java diff --git a/common/src/ctbrec/sites/mfc/Model.java b/common/src/main/java/ctbrec/sites/mfc/Model.java similarity index 100% rename from common/src/ctbrec/sites/mfc/Model.java rename to common/src/main/java/ctbrec/sites/mfc/Model.java diff --git a/common/src/ctbrec/sites/mfc/MyFreeCams.java b/common/src/main/java/ctbrec/sites/mfc/MyFreeCams.java similarity index 100% rename from common/src/ctbrec/sites/mfc/MyFreeCams.java rename to common/src/main/java/ctbrec/sites/mfc/MyFreeCams.java diff --git a/common/src/ctbrec/sites/mfc/MyFreeCamsClient.java b/common/src/main/java/ctbrec/sites/mfc/MyFreeCamsClient.java similarity index 100% rename from common/src/ctbrec/sites/mfc/MyFreeCamsClient.java rename to common/src/main/java/ctbrec/sites/mfc/MyFreeCamsClient.java diff --git a/common/src/ctbrec/sites/mfc/MyFreeCamsHttpClient.java b/common/src/main/java/ctbrec/sites/mfc/MyFreeCamsHttpClient.java similarity index 100% rename from common/src/ctbrec/sites/mfc/MyFreeCamsHttpClient.java rename to common/src/main/java/ctbrec/sites/mfc/MyFreeCamsHttpClient.java diff --git a/common/src/ctbrec/sites/mfc/MyFreeCamsModel.java b/common/src/main/java/ctbrec/sites/mfc/MyFreeCamsModel.java similarity index 100% rename from common/src/ctbrec/sites/mfc/MyFreeCamsModel.java rename to common/src/main/java/ctbrec/sites/mfc/MyFreeCamsModel.java diff --git a/common/src/ctbrec/sites/mfc/ServerConfig.java b/common/src/main/java/ctbrec/sites/mfc/ServerConfig.java similarity index 100% rename from common/src/ctbrec/sites/mfc/ServerConfig.java rename to common/src/main/java/ctbrec/sites/mfc/ServerConfig.java diff --git a/common/src/ctbrec/sites/mfc/SessionState.java b/common/src/main/java/ctbrec/sites/mfc/SessionState.java similarity index 100% rename from common/src/ctbrec/sites/mfc/SessionState.java rename to common/src/main/java/ctbrec/sites/mfc/SessionState.java diff --git a/common/src/ctbrec/sites/mfc/Share.java b/common/src/main/java/ctbrec/sites/mfc/Share.java similarity index 100% rename from common/src/ctbrec/sites/mfc/Share.java rename to common/src/main/java/ctbrec/sites/mfc/Share.java diff --git a/common/src/ctbrec/sites/mfc/State.java b/common/src/main/java/ctbrec/sites/mfc/State.java similarity index 100% rename from common/src/ctbrec/sites/mfc/State.java rename to common/src/main/java/ctbrec/sites/mfc/State.java diff --git a/common/src/ctbrec/sites/mfc/User.java b/common/src/main/java/ctbrec/sites/mfc/User.java similarity index 100% rename from common/src/ctbrec/sites/mfc/User.java rename to common/src/main/java/ctbrec/sites/mfc/User.java diff --git a/common/src/ctbrec/sites/mfc/X.java b/common/src/main/java/ctbrec/sites/mfc/X.java similarity index 100% rename from common/src/ctbrec/sites/mfc/X.java rename to common/src/main/java/ctbrec/sites/mfc/X.java diff --git a/common/src/org/taktik/CHANGELOG.md b/common/src/main/java/org/taktik/CHANGELOG.md similarity index 100% rename from common/src/org/taktik/CHANGELOG.md rename to common/src/main/java/org/taktik/CHANGELOG.md diff --git a/common/src/org/taktik/ioutils/NIOUtils.java b/common/src/main/java/org/taktik/ioutils/NIOUtils.java similarity index 100% rename from common/src/org/taktik/ioutils/NIOUtils.java rename to common/src/main/java/org/taktik/ioutils/NIOUtils.java diff --git a/common/src/org/taktik/mpegts/Constants.java b/common/src/main/java/org/taktik/mpegts/Constants.java similarity index 100% rename from common/src/org/taktik/mpegts/Constants.java rename to common/src/main/java/org/taktik/mpegts/Constants.java diff --git a/common/src/org/taktik/mpegts/MTSPacket.java b/common/src/main/java/org/taktik/mpegts/MTSPacket.java similarity index 100% rename from common/src/org/taktik/mpegts/MTSPacket.java rename to common/src/main/java/org/taktik/mpegts/MTSPacket.java diff --git a/common/src/org/taktik/mpegts/Merger.java b/common/src/main/java/org/taktik/mpegts/Merger.java similarity index 100% rename from common/src/org/taktik/mpegts/Merger.java rename to common/src/main/java/org/taktik/mpegts/Merger.java diff --git a/common/src/org/taktik/mpegts/PATSection.java b/common/src/main/java/org/taktik/mpegts/PATSection.java similarity index 100% rename from common/src/org/taktik/mpegts/PATSection.java rename to common/src/main/java/org/taktik/mpegts/PATSection.java diff --git a/common/src/org/taktik/mpegts/PMTSection.java b/common/src/main/java/org/taktik/mpegts/PMTSection.java similarity index 100% rename from common/src/org/taktik/mpegts/PMTSection.java rename to common/src/main/java/org/taktik/mpegts/PMTSection.java diff --git a/common/src/org/taktik/mpegts/PSISection.java b/common/src/main/java/org/taktik/mpegts/PSISection.java similarity index 100% rename from common/src/org/taktik/mpegts/PSISection.java rename to common/src/main/java/org/taktik/mpegts/PSISection.java diff --git a/common/src/org/taktik/mpegts/PacketSupport.java b/common/src/main/java/org/taktik/mpegts/PacketSupport.java similarity index 100% rename from common/src/org/taktik/mpegts/PacketSupport.java rename to common/src/main/java/org/taktik/mpegts/PacketSupport.java diff --git a/common/src/org/taktik/mpegts/Streamer.java b/common/src/main/java/org/taktik/mpegts/Streamer.java similarity index 100% rename from common/src/org/taktik/mpegts/Streamer.java rename to common/src/main/java/org/taktik/mpegts/Streamer.java diff --git a/common/src/org/taktik/mpegts/StreamerTest.java b/common/src/main/java/org/taktik/mpegts/StreamerTest.java similarity index 100% rename from common/src/org/taktik/mpegts/StreamerTest.java rename to common/src/main/java/org/taktik/mpegts/StreamerTest.java diff --git a/common/src/org/taktik/mpegts/sinks/ByteChannelSink.java b/common/src/main/java/org/taktik/mpegts/sinks/ByteChannelSink.java similarity index 100% rename from common/src/org/taktik/mpegts/sinks/ByteChannelSink.java rename to common/src/main/java/org/taktik/mpegts/sinks/ByteChannelSink.java diff --git a/common/src/org/taktik/mpegts/sinks/MTSSink.java b/common/src/main/java/org/taktik/mpegts/sinks/MTSSink.java similarity index 100% rename from common/src/org/taktik/mpegts/sinks/MTSSink.java rename to common/src/main/java/org/taktik/mpegts/sinks/MTSSink.java diff --git a/common/src/org/taktik/mpegts/sinks/UDPTransport.java b/common/src/main/java/org/taktik/mpegts/sinks/UDPTransport.java similarity index 100% rename from common/src/org/taktik/mpegts/sinks/UDPTransport.java rename to common/src/main/java/org/taktik/mpegts/sinks/UDPTransport.java diff --git a/common/src/org/taktik/mpegts/sources/AbstractByteChannelMTSSource.java b/common/src/main/java/org/taktik/mpegts/sources/AbstractByteChannelMTSSource.java similarity index 100% rename from common/src/org/taktik/mpegts/sources/AbstractByteChannelMTSSource.java rename to common/src/main/java/org/taktik/mpegts/sources/AbstractByteChannelMTSSource.java diff --git a/common/src/org/taktik/mpegts/sources/AbstractMTSSource.java b/common/src/main/java/org/taktik/mpegts/sources/AbstractMTSSource.java similarity index 100% rename from common/src/org/taktik/mpegts/sources/AbstractMTSSource.java rename to common/src/main/java/org/taktik/mpegts/sources/AbstractMTSSource.java diff --git a/common/src/org/taktik/mpegts/sources/BlockingMultiMTSSource.java b/common/src/main/java/org/taktik/mpegts/sources/BlockingMultiMTSSource.java similarity index 100% rename from common/src/org/taktik/mpegts/sources/BlockingMultiMTSSource.java rename to common/src/main/java/org/taktik/mpegts/sources/BlockingMultiMTSSource.java diff --git a/common/src/org/taktik/mpegts/sources/ByteChannelMTSSource.java b/common/src/main/java/org/taktik/mpegts/sources/ByteChannelMTSSource.java similarity index 100% rename from common/src/org/taktik/mpegts/sources/ByteChannelMTSSource.java rename to common/src/main/java/org/taktik/mpegts/sources/ByteChannelMTSSource.java diff --git a/common/src/org/taktik/mpegts/sources/ByteSourceMTSSource.java b/common/src/main/java/org/taktik/mpegts/sources/ByteSourceMTSSource.java similarity index 100% rename from common/src/org/taktik/mpegts/sources/ByteSourceMTSSource.java rename to common/src/main/java/org/taktik/mpegts/sources/ByteSourceMTSSource.java diff --git a/common/src/org/taktik/mpegts/sources/ConcatenatingMTSSource.java b/common/src/main/java/org/taktik/mpegts/sources/ConcatenatingMTSSource.java similarity index 100% rename from common/src/org/taktik/mpegts/sources/ConcatenatingMTSSource.java rename to common/src/main/java/org/taktik/mpegts/sources/ConcatenatingMTSSource.java diff --git a/common/src/org/taktik/mpegts/sources/ContinuityFixer.java b/common/src/main/java/org/taktik/mpegts/sources/ContinuityFixer.java similarity index 100% rename from common/src/org/taktik/mpegts/sources/ContinuityFixer.java rename to common/src/main/java/org/taktik/mpegts/sources/ContinuityFixer.java diff --git a/common/src/org/taktik/mpegts/sources/ContinuityFixingMTSSource.java b/common/src/main/java/org/taktik/mpegts/sources/ContinuityFixingMTSSource.java similarity index 100% rename from common/src/org/taktik/mpegts/sources/ContinuityFixingMTSSource.java rename to common/src/main/java/org/taktik/mpegts/sources/ContinuityFixingMTSSource.java diff --git a/common/src/org/taktik/mpegts/sources/FixedBitrateMTSSource.java b/common/src/main/java/org/taktik/mpegts/sources/FixedBitrateMTSSource.java similarity index 100% rename from common/src/org/taktik/mpegts/sources/FixedBitrateMTSSource.java rename to common/src/main/java/org/taktik/mpegts/sources/FixedBitrateMTSSource.java diff --git a/common/src/org/taktik/mpegts/sources/InputStreamMTSSource.java b/common/src/main/java/org/taktik/mpegts/sources/InputStreamMTSSource.java similarity index 100% rename from common/src/org/taktik/mpegts/sources/InputStreamMTSSource.java rename to common/src/main/java/org/taktik/mpegts/sources/InputStreamMTSSource.java diff --git a/common/src/org/taktik/mpegts/sources/LoopingMTSSource.java b/common/src/main/java/org/taktik/mpegts/sources/LoopingMTSSource.java similarity index 100% rename from common/src/org/taktik/mpegts/sources/LoopingMTSSource.java rename to common/src/main/java/org/taktik/mpegts/sources/LoopingMTSSource.java diff --git a/common/src/org/taktik/mpegts/sources/MTSSource.java b/common/src/main/java/org/taktik/mpegts/sources/MTSSource.java similarity index 100% rename from common/src/org/taktik/mpegts/sources/MTSSource.java rename to common/src/main/java/org/taktik/mpegts/sources/MTSSource.java diff --git a/common/src/org/taktik/mpegts/sources/MTSSources.java b/common/src/main/java/org/taktik/mpegts/sources/MTSSources.java similarity index 100% rename from common/src/org/taktik/mpegts/sources/MTSSources.java rename to common/src/main/java/org/taktik/mpegts/sources/MTSSources.java diff --git a/common/src/org/taktik/mpegts/sources/MultiplexingMTSSource.java b/common/src/main/java/org/taktik/mpegts/sources/MultiplexingMTSSource.java similarity index 100% rename from common/src/org/taktik/mpegts/sources/MultiplexingMTSSource.java rename to common/src/main/java/org/taktik/mpegts/sources/MultiplexingMTSSource.java diff --git a/common/src/org/taktik/mpegts/sources/NullPacketSource.java b/common/src/main/java/org/taktik/mpegts/sources/NullPacketSource.java similarity index 100% rename from common/src/org/taktik/mpegts/sources/NullPacketSource.java rename to common/src/main/java/org/taktik/mpegts/sources/NullPacketSource.java diff --git a/common/src/org/taktik/mpegts/sources/ResettableMTSSource.java b/common/src/main/java/org/taktik/mpegts/sources/ResettableMTSSource.java similarity index 100% rename from common/src/org/taktik/mpegts/sources/ResettableMTSSource.java rename to common/src/main/java/org/taktik/mpegts/sources/ResettableMTSSource.java diff --git a/common/src/org/taktik/mpegts/sources/SeekableByteChannelMTSSource.java b/common/src/main/java/org/taktik/mpegts/sources/SeekableByteChannelMTSSource.java similarity index 100% rename from common/src/org/taktik/mpegts/sources/SeekableByteChannelMTSSource.java rename to common/src/main/java/org/taktik/mpegts/sources/SeekableByteChannelMTSSource.java diff --git a/client/src/test/java/ctbrec/VersionTest.java b/common/src/test/java/ctbrec/VersionTest.java similarity index 100% rename from client/src/test/java/ctbrec/VersionTest.java rename to common/src/test/java/ctbrec/VersionTest.java