diff --git a/ktp-image-sharer/shareprovider.cpp → image-sharer/shareprovider.cpp b/ktp-image-sharer/shareprovider.cpp → image-sharer/shareprovider.cpp
@@ -1,21 +1,20 @@
 /*
- * Copyright 2014  Ahmed Ibrahim Khalil <ahmedibrahimkhali@gmail.com>
+ * 
+ * Copyright (C) 2014  Ahmed I. Khalil <ahmedibrahimkhali@gmail.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License or (at your option) version 3 or any later version
- * accepted by the membership of KDE e.V. (or its successor approved
- * by the membership of KDE e.V.), which shall act as a proxy
- * defined in Section 14 of version 3 of the license.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
 
@@ -79,6 +78,11 @@ ShareProvider::ShareProvider(ShareService shareServiceType, QObject *parent)
     d->m_shareServiceType = shareServiceType;
 }
 
+ShareProvider::~ShareProvider()
+{
+    delete d;
+}
+
 void ShareProvider::setShareServiceType(ShareService shareServiceType)
 {
     delete d->m_sharer;
@@ -99,10 +103,10 @@ void ShareProvider::publish(const QString& filePath)
     KUrl fileUrl(filePath);
 
     KIO::MimetypeJob *mimetypeJob = KIO::mimetype(fileUrl, KIO::HideProgressInfo);
-    connect(mimetypeJob, SIGNAL(finished(KJob*)), this, SLOT(mimetypeJobFinished(KJob*)));
+    connect(mimetypeJob, SIGNAL(finished(KJob*)), this, SLOT(onMimetypeJobFinished(KJob*)));
 }
 
-void ShareProvider::mimetypeJobFinished(KJob* job)
+void ShareProvider::onMimetypeJobFinished(KJob* job)
 {
     KIO::MimetypeJob *mjob = qobject_cast<KIO::MimetypeJob *>(job);
     if (!mjob) {
@@ -126,21 +130,21 @@ void ShareProvider::mimetypeJobFinished(KJob* job)
     }
 
     KIO::FileJob *fjob = KIO::open(mjob->url(), QIODevice::ReadOnly);
-    connect(fjob, SIGNAL(open(KIO::Job*)), this, SLOT(openFile(KIO::Job*)));
+    connect(fjob, SIGNAL(open(KIO::Job*)), this, SLOT(onFileOpened(KIO::Job*)));
 
     mjob->deleteLater();
 }
 
-void ShareProvider::openFile(KIO::Job* job)
+void ShareProvider::onFileOpened(KIO::Job* job)
 {
     // finished opening the file, now try to read it's content
     KIO::FileJob *fjob = static_cast<KIO::FileJob*>(job);
     fjob->read(fjob->size());
     connect(fjob, SIGNAL(data(KIO::Job*,QByteArray)),
-            this, SLOT(finishedContentData(KIO::Job*,QByteArray)));
+            this, SLOT(onFinishedReadingFile(KIO::Job*,QByteArray)));
 }
 
-void ShareProvider::finishedContentData(KIO::Job* job, const QByteArray& data)
+void ShareProvider::onFinishedReadingFile(KIO::Job* job, const QByteArray& data)
 {
     job->disconnect(this);
     qobject_cast<KIO::FileJob *>(job)->close();
@@ -160,19 +164,19 @@ void ShareProvider::finishedContentData(KIO::Job* job, const QByteArray& data)
         KIO::TransferJob *tJob = KIO::http_post(sharer->url(), sharer->postBody(data), KIO::HideProgressInfo);
         tJob->setMetaData(sharer->headers());
         connect(tJob, SIGNAL(data(KIO::Job*,QByteArray)),
-                this, SLOT(transferJobDataReceived(KIO::Job*,QByteArray)));
-        connect(tJob, SIGNAL(result(KJob*)), this, SLOT(transferJobResultReceived(KJob*)));
+                this, SLOT(onTransferJobDataReceived(KIO::Job*,QByteArray)));
+        connect(tJob, SIGNAL(result(KJob*)), this, SLOT(onTransferJobResultReceived(KJob*)));
 
     }
 }
 
-void ShareProvider::transferJobDataReceived(KIO::Job* job, QByteArray data)
+void ShareProvider::onTransferJobDataReceived(KIO::Job* job, QByteArray data)
 {
     Q_UNUSED(job);
     d->m_data.append(data);
 }
 
-void ShareProvider::transferJobResultReceived(KJob* job)
+void ShareProvider::onTransferJobResultReceived(KJob* job)
 {
     if (d->m_data.size() == 0) {
         emit finishedError(i18n("Service was not available"));
@@ -198,15 +202,6 @@ void ShareProvider::transferJobResultReceived(KJob* job)
             }
         }
     }
-
-    job->deleteLater();
-}
-
-
-
-ShareProvider::~ShareProvider()
-{
-    delete d;
 }
 
 
diff --git a/image-sharer/shareprovider.h b/image-sharer/shareprovider.h
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2014  Ahmed I. Khalil <ahmedibrahimkhali@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef SHAREPROVIDER_H
+#define SHAREPROVIDER_H
+
+#include <QObject>
+
+class ShareProviderPrivate;
+class KJob;
+
+namespace KIO {
+class Job;
+}
+
+class ShareProvider : public QObject
+{
+    Q_OBJECT
+
+public:
+    // Available Image Share Services
+    enum ShareService {
+        Imgur,
+        SimplestImageHosting,
+        ImageBin
+    };
+
+    ShareProvider(ShareService shareServiceType, QObject *parent = 0);
+    virtual ~ShareProvider();
+
+    ShareService shareServiceType() const;
+    void setShareServiceType(ShareService shareServiceType);
+
+    void publish(const QString &filePath);
+
+Q_SIGNALS:
+    void finishedSuccess(const QString &url);
+    void finishedError(const QString &msg);
+
+protected Q_SLOTS:
+    void onMimetypeJobFinished(KJob *job);
+    void onFileOpened(KIO::Job *job);
+    void onFinishedReadingFile(KIO::Job *job, const QByteArray &data);
+    void onTransferJobDataReceived(KIO::Job *job, QByteArray data);
+    void onTransferJobResultReceived(KJob *job);
+
+private:
+    ShareProviderPrivate * const d;
+};
+
+#endif // SHAREPROVIDER_H
diff --git a/...age-sharer/simplestimagehostingsharer.cpp → image-sharer/simplestimagehostingsharer.cpp b/...age-sharer/simplestimagehostingsharer.cpp → image-sharer/simplestimagehostingsharer.cpp
@@ -1,22 +1,19 @@
 /*
- * <one line to give the library's name and an idea of what it does.>
- * Copyright 2014  Ahmed I. Khalil <ahmedibrahimkhali@gmail.com>
+ * Copyright (C) 2014  Ahmed I. Khalil <ahmedibrahimkhali@gmail.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License or (at your option) version 3 or any later version
- * accepted by the membership of KDE e.V. (or its successor approved
- * by the membership of KDE e.V.), which shall act as a proxy
- * defined in Section 14 of version 3 of the license.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
 

diff --git a/image-sharer/simplestimagehostingsharer.h b/image-sharer/simplestimagehostingsharer.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2014  Ahmed I. Khalil <ahmedibrahimkhali@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef SIMPLESTIMAGEHOSTINGSHARER_H
+#define SIMPLESTIMAGEHOSTINGSHARER_H
+
+#include "abstractsharer.h"
+#include "mpform.h"
+
+class SimplestImageHostingSharer : public AbstractSharer
+{
+public:
+    SimplestImageHostingSharer(const QString& contentPath);
+
+    KUrl url() const;
+    void parseResponse(const QByteArray& responseData);
+    QByteArray postBody(const QByteArray& imageData);
+};
+
+#endif // SIMPLESTIMAGEHOSTINGSHARER_H
diff --git a/ktp-image-sharer/abstractsharer.cpp b/ktp-image-sharer/abstractsharer.cpp
diff --git a/ktp-image-sharer/abstractsharer.h b/ktp-image-sharer/abstractsharer.h
diff --git a/ktp-image-sharer/imagebinsharer.h b/ktp-image-sharer/imagebinsharer.h
diff --git a/ktp-image-sharer/imgursharer.h b/ktp-image-sharer/imgursharer.h
diff --git a/ktp-image-sharer/shareprovider.h b/ktp-image-sharer/shareprovider.h
diff --git a/ktp-image-sharer/simplestimagehostingsharer.h b/ktp-image-sharer/simplestimagehostingsharer.h
diff --git a/ktp-test-exec/CMakeLists.txt b/ktp-test-exec/CMakeLists.txt
@@ -7,6 +7,6 @@ set(ktp-test_SRCS ktp-test.cpp main.cpp)
 
 kde4_add_executable(ktp-test-exec ${ktp-test_SRCS})
 
-target_link_libraries(ktp-test-exec ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ktp-image-sharer)
+target_link_libraries(ktp-test-exec ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} image-sharer)
 
 install(TARGETS ktp-test-exec RUNTIME DESTINATION bin)
diff --git a/ktp-test-exec/ktp-test.cpp b/ktp-test-exec/ktp-test.cpp
@@ -8,7 +8,7 @@
 #include <QMessageBox>
 
 
-#include "ktp-image-sharer/shareprovider.h"
+#include "image-sharer/shareprovider.h"
 
 ktp_test::ktp_test()
 {