diff --git a/src/main/java/com/rogiel/httpchannel/service/AbstractDownloader.java b/src/main/java/com/rogiel/httpchannel/service/AbstractDownloader.java
index 03f5fd8..40affa3 100644
--- a/src/main/java/com/rogiel/httpchannel/service/AbstractDownloader.java
+++ b/src/main/java/com/rogiel/httpchannel/service/AbstractDownloader.java
@@ -19,8 +19,8 @@ package com.rogiel.httpchannel.service;
import java.io.IOException;
import com.rogiel.httpchannel.service.DownloadListener.TimerWaitReason;
+import com.rogiel.httpchannel.util.ThreadUtils;
-import net.sf.f2s.util.ThreadUtils;
/**
* @author rogiel
diff --git a/src/main/java/com/rogiel/httpchannel/service/UploadListenerContentBody.java b/src/main/java/com/rogiel/httpchannel/service/UploadListenerContentBody.java
index ec88413..83f93c7 100644
--- a/src/main/java/com/rogiel/httpchannel/service/UploadListenerContentBody.java
+++ b/src/main/java/com/rogiel/httpchannel/service/UploadListenerContentBody.java
@@ -21,12 +21,12 @@ import java.io.OutputStream;
import java.nio.channels.Channels;
import java.nio.channels.WritableByteChannel;
-import net.sf.f2s.util.ThreadUtils;
import org.apache.http.entity.mime.content.AbstractContentBody;
import org.apache.http.entity.mime.content.ContentBody;
import com.rogiel.httpchannel.service.channel.LinkedUploadChannel;
+import com.rogiel.httpchannel.util.ThreadUtils;
/**
* {@link ContentBody} used to upload files in {@link Uploader} implementations.
diff --git a/src/main/java/com/rogiel/httpchannel/service/config/ServiceConfiguration.java b/src/main/java/com/rogiel/httpchannel/service/config/ServiceConfiguration.java
index 7c3c3c0..399831a 100644
--- a/src/main/java/com/rogiel/httpchannel/service/config/ServiceConfiguration.java
+++ b/src/main/java/com/rogiel/httpchannel/service/config/ServiceConfiguration.java
@@ -18,7 +18,8 @@ package com.rogiel.httpchannel.service.config;
import java.lang.reflect.Proxy;
-import net.sf.f2s.util.transformer.Transformer;
+import com.rogiel.httpchannel.util.transformer.Transformer;
+
/**
* This is an flag interface to indicate that an certain Interface is the
diff --git a/src/main/java/com/rogiel/httpchannel/service/config/ServiceConfigurationHelper.java b/src/main/java/com/rogiel/httpchannel/service/config/ServiceConfigurationHelper.java
index c3b494c..ed92903 100644
--- a/src/main/java/com/rogiel/httpchannel/service/config/ServiceConfigurationHelper.java
+++ b/src/main/java/com/rogiel/httpchannel/service/config/ServiceConfigurationHelper.java
@@ -25,7 +25,8 @@ import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.util.Properties;
-import net.sf.f2s.util.transformer.TransformerFactory;
+import com.rogiel.httpchannel.util.transformer.TransformerFactory;
+
/**
* Helper class for {@link ServiceConfiguration} system.
diff --git a/src/main/java/com/rogiel/httpchannel/service/impl/MegaUploadService.java b/src/main/java/com/rogiel/httpchannel/service/impl/MegaUploadService.java
index 26e6222..cfc537e 100644
--- a/src/main/java/com/rogiel/httpchannel/service/impl/MegaUploadService.java
+++ b/src/main/java/com/rogiel/httpchannel/service/impl/MegaUploadService.java
@@ -22,9 +22,6 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.regex.Pattern;
-import net.sf.f2s.util.HttpClientUtils;
-import net.sf.f2s.util.PatternUtils;
-import net.sf.f2s.util.ThreadUtils;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
@@ -62,6 +59,9 @@ import com.rogiel.httpchannel.service.channel.LinkedUploadChannel.LinkedUploadCh
import com.rogiel.httpchannel.service.config.ServiceConfiguration;
import com.rogiel.httpchannel.service.config.ServiceConfigurationProperty;
import com.rogiel.httpchannel.service.impl.MegaUploadService.MegaUploadServiceConfiguration;
+import com.rogiel.httpchannel.util.HttpClientUtils;
+import com.rogiel.httpchannel.util.PatternUtils;
+import com.rogiel.httpchannel.util.ThreadUtils;
/**
* This service handles login, upload and download to MegaUpload.com.
diff --git a/src/main/java/net/sf/f2s/util/HttpClientUtils.java b/src/main/java/com/rogiel/httpchannel/util/HttpClientUtils.java
similarity index 98%
rename from src/main/java/net/sf/f2s/util/HttpClientUtils.java
rename to src/main/java/com/rogiel/httpchannel/util/HttpClientUtils.java
index 244db20..5ab8a0c 100644
--- a/src/main/java/net/sf/f2s/util/HttpClientUtils.java
+++ b/src/main/java/com/rogiel/httpchannel/util/HttpClientUtils.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with seedbox. If not, see .
*/
-package net.sf.f2s.util;
+package com.rogiel.httpchannel.util;
import java.io.IOException;
import java.io.InputStream;
diff --git a/src/main/java/net/sf/f2s/util/PatternUtils.java b/src/main/java/com/rogiel/httpchannel/util/PatternUtils.java
similarity index 97%
rename from src/main/java/net/sf/f2s/util/PatternUtils.java
rename to src/main/java/com/rogiel/httpchannel/util/PatternUtils.java
index 48d5a18..df342e9 100644
--- a/src/main/java/net/sf/f2s/util/PatternUtils.java
+++ b/src/main/java/com/rogiel/httpchannel/util/PatternUtils.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with seedbox. If not, see .
*/
-package net.sf.f2s.util;
+package com.rogiel.httpchannel.util;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
diff --git a/src/main/java/net/sf/f2s/util/ThreadUtils.java b/src/main/java/com/rogiel/httpchannel/util/ThreadUtils.java
similarity index 95%
rename from src/main/java/net/sf/f2s/util/ThreadUtils.java
rename to src/main/java/com/rogiel/httpchannel/util/ThreadUtils.java
index 45b441b..ae2db4c 100644
--- a/src/main/java/net/sf/f2s/util/ThreadUtils.java
+++ b/src/main/java/com/rogiel/httpchannel/util/ThreadUtils.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with seedbox. If not, see .
*/
-package net.sf.f2s.util;
+package com.rogiel.httpchannel.util;
/**
* @author Rogiel
diff --git a/src/main/java/net/sf/f2s/util/transformer/TransformationException.java b/src/main/java/com/rogiel/httpchannel/util/transformer/TransformationException.java
similarity index 96%
rename from src/main/java/net/sf/f2s/util/transformer/TransformationException.java
rename to src/main/java/com/rogiel/httpchannel/util/transformer/TransformationException.java
index 478641a..775b7c1 100644
--- a/src/main/java/net/sf/f2s/util/transformer/TransformationException.java
+++ b/src/main/java/com/rogiel/httpchannel/util/transformer/TransformationException.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with seedbox. If not, see .
*/
-package net.sf.f2s.util.transformer;
+package com.rogiel.httpchannel.util.transformer;
/**
* @author Rogiel
diff --git a/src/main/java/net/sf/f2s/util/transformer/Transformer.java b/src/main/java/com/rogiel/httpchannel/util/transformer/Transformer.java
similarity index 94%
rename from src/main/java/net/sf/f2s/util/transformer/Transformer.java
rename to src/main/java/com/rogiel/httpchannel/util/transformer/Transformer.java
index c78a877..4596845 100644
--- a/src/main/java/net/sf/f2s/util/transformer/Transformer.java
+++ b/src/main/java/com/rogiel/httpchannel/util/transformer/Transformer.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with seedbox. If not, see .
*/
-package net.sf.f2s.util.transformer;
+package com.rogiel.httpchannel.util.transformer;
/**
* @author rogiel
diff --git a/src/main/java/net/sf/f2s/util/transformer/TransformerFactory.java b/src/main/java/com/rogiel/httpchannel/util/transformer/TransformerFactory.java
similarity index 78%
rename from src/main/java/net/sf/f2s/util/transformer/TransformerFactory.java
rename to src/main/java/com/rogiel/httpchannel/util/transformer/TransformerFactory.java
index 43dc12b..a7c3221 100644
--- a/src/main/java/net/sf/f2s/util/transformer/TransformerFactory.java
+++ b/src/main/java/com/rogiel/httpchannel/util/transformer/TransformerFactory.java
@@ -14,15 +14,16 @@
* You should have received a copy of the GNU General Public License
* along with seedbox. If not, see .
*/
-package net.sf.f2s.util.transformer;
+package com.rogiel.httpchannel.util.transformer;
import java.net.URL;
-import net.sf.f2s.util.transformer.impl.BooleanTransformer;
-import net.sf.f2s.util.transformer.impl.IntegerTransformer;
-import net.sf.f2s.util.transformer.impl.LongTransformer;
-import net.sf.f2s.util.transformer.impl.StringTransformer;
-import net.sf.f2s.util.transformer.impl.URLTransformer;
+import com.rogiel.httpchannel.util.transformer.impl.BooleanTransformer;
+import com.rogiel.httpchannel.util.transformer.impl.IntegerTransformer;
+import com.rogiel.httpchannel.util.transformer.impl.LongTransformer;
+import com.rogiel.httpchannel.util.transformer.impl.StringTransformer;
+import com.rogiel.httpchannel.util.transformer.impl.URLTransformer;
+
/**
* @author Rogiel
diff --git a/src/main/java/net/sf/f2s/util/transformer/impl/BooleanTransformer.java b/src/main/java/com/rogiel/httpchannel/util/transformer/impl/BooleanTransformer.java
similarity index 88%
rename from src/main/java/net/sf/f2s/util/transformer/impl/BooleanTransformer.java
rename to src/main/java/com/rogiel/httpchannel/util/transformer/impl/BooleanTransformer.java
index f860811..4951e92 100644
--- a/src/main/java/net/sf/f2s/util/transformer/impl/BooleanTransformer.java
+++ b/src/main/java/com/rogiel/httpchannel/util/transformer/impl/BooleanTransformer.java
@@ -14,9 +14,9 @@
* You should have received a copy of the GNU General Public License
* along with seedbox. If not, see .
*/
-package net.sf.f2s.util.transformer.impl;
+package com.rogiel.httpchannel.util.transformer.impl;
-import net.sf.f2s.util.transformer.Transformer;
+import com.rogiel.httpchannel.util.transformer.Transformer;
/**
* @author rogiel
diff --git a/src/main/java/net/sf/f2s/util/transformer/impl/IntegerTransformer.java b/src/main/java/com/rogiel/httpchannel/util/transformer/impl/IntegerTransformer.java
similarity index 88%
rename from src/main/java/net/sf/f2s/util/transformer/impl/IntegerTransformer.java
rename to src/main/java/com/rogiel/httpchannel/util/transformer/impl/IntegerTransformer.java
index 6830b0f..0356298 100644
--- a/src/main/java/net/sf/f2s/util/transformer/impl/IntegerTransformer.java
+++ b/src/main/java/com/rogiel/httpchannel/util/transformer/impl/IntegerTransformer.java
@@ -14,9 +14,9 @@
* You should have received a copy of the GNU General Public License
* along with seedbox. If not, see .
*/
-package net.sf.f2s.util.transformer.impl;
+package com.rogiel.httpchannel.util.transformer.impl;
-import net.sf.f2s.util.transformer.Transformer;
+import com.rogiel.httpchannel.util.transformer.Transformer;
/**
* @author rogiel
diff --git a/src/main/java/net/sf/f2s/util/transformer/impl/LongTransformer.java b/src/main/java/com/rogiel/httpchannel/util/transformer/impl/LongTransformer.java
similarity index 88%
rename from src/main/java/net/sf/f2s/util/transformer/impl/LongTransformer.java
rename to src/main/java/com/rogiel/httpchannel/util/transformer/impl/LongTransformer.java
index 891e468..3b9a64a 100644
--- a/src/main/java/net/sf/f2s/util/transformer/impl/LongTransformer.java
+++ b/src/main/java/com/rogiel/httpchannel/util/transformer/impl/LongTransformer.java
@@ -14,9 +14,9 @@
* You should have received a copy of the GNU General Public License
* along with seedbox. If not, see .
*/
-package net.sf.f2s.util.transformer.impl;
+package com.rogiel.httpchannel.util.transformer.impl;
-import net.sf.f2s.util.transformer.Transformer;
+import com.rogiel.httpchannel.util.transformer.Transformer;
/**
* @author rogiel
diff --git a/src/main/java/net/sf/f2s/util/transformer/impl/StringTransformer.java b/src/main/java/com/rogiel/httpchannel/util/transformer/impl/StringTransformer.java
similarity index 88%
rename from src/main/java/net/sf/f2s/util/transformer/impl/StringTransformer.java
rename to src/main/java/com/rogiel/httpchannel/util/transformer/impl/StringTransformer.java
index 3935d01..99221bf 100644
--- a/src/main/java/net/sf/f2s/util/transformer/impl/StringTransformer.java
+++ b/src/main/java/com/rogiel/httpchannel/util/transformer/impl/StringTransformer.java
@@ -14,9 +14,9 @@
* You should have received a copy of the GNU General Public License
* along with seedbox. If not, see .
*/
-package net.sf.f2s.util.transformer.impl;
+package com.rogiel.httpchannel.util.transformer.impl;
-import net.sf.f2s.util.transformer.Transformer;
+import com.rogiel.httpchannel.util.transformer.Transformer;
/**
* @author rogiel
diff --git a/src/main/java/net/sf/f2s/util/transformer/impl/URLTransformer.java b/src/main/java/com/rogiel/httpchannel/util/transformer/impl/URLTransformer.java
similarity index 84%
rename from src/main/java/net/sf/f2s/util/transformer/impl/URLTransformer.java
rename to src/main/java/com/rogiel/httpchannel/util/transformer/impl/URLTransformer.java
index 47824f9..eb4046e 100644
--- a/src/main/java/net/sf/f2s/util/transformer/impl/URLTransformer.java
+++ b/src/main/java/com/rogiel/httpchannel/util/transformer/impl/URLTransformer.java
@@ -14,13 +14,14 @@
* You should have received a copy of the GNU General Public License
* along with seedbox. If not, see .
*/
-package net.sf.f2s.util.transformer.impl;
+package com.rogiel.httpchannel.util.transformer.impl;
import java.net.MalformedURLException;
import java.net.URL;
-import net.sf.f2s.util.transformer.TransformationException;
-import net.sf.f2s.util.transformer.Transformer;
+import com.rogiel.httpchannel.util.transformer.TransformationException;
+import com.rogiel.httpchannel.util.transformer.Transformer;
+
/**
* @author rogiel