diff --git a/SMTPEmail.pro b/SMTPEmail.pro
index 7a6af27..a57c238 100644
--- a/SMTPEmail.pro
+++ b/SMTPEmail.pro
@@ -10,25 +10,26 @@ TARGET = SMTPEmail
 TEMPLATE = app
 
 
-SOURCES += smtpclient.cpp \
-    mimemessage.cpp \
-    mimepart.cpp \
-    mimetext.cpp \
-    mimeattachment.cpp \
-    mimehtml.cpp \
-    emailaddress.cpp \
-    mimefile.cpp \
-    mimeinlinefile.cpp \
-    main.cpp
+SOURCES += \
+    src/emailaddress.cpp \
+    src/mimeattachment.cpp \
+    src/mimefile.cpp \
+    src/mimehtml.cpp \
+    src/mimeinlinefile.cpp \
+    src/mimemessage.cpp \
+    src/mimepart.cpp \
+    src/mimetext.cpp \
+    src/smtpclient.cpp \
+    demos/demo1.cpp
 
 HEADERS  += \
-    smtpclient.h \
-    mimemessage.h \
-    mimepart.h \
-    mimetext.h \
-    mimeattachment.h \
-    mimehtml.h \
-    emailaddress.h \
-    mimefile.h \
-    mimeinlinefile.h \
-    SmtpMime
+    src/emailaddress.h \
+    src/mimeattachment.h \
+    src/mimefile.h \
+    src/mimehtml.h \
+    src/mimeinlinefile.h \
+    src/mimemessage.h \
+    src/mimepart.h \
+    src/mimetext.h \
+    src/smtpclient.h \
+    src/SmtpMime
diff --git a/main.cpp b/demos/demo1.cpp
similarity index 97%
rename from main.cpp
rename to demos/demo1.cpp
index aa9191c..5985bae 100644
--- a/main.cpp
+++ b/demos/demo1.cpp
@@ -1,6 +1,6 @@
 #include <QtGui/QApplication>
 
-#include "SmtpMime"
+#include "../src/SmtpMime"
 
 
 int main(int argc, char *argv[])
diff --git a/SmtpMime b/src/SmtpMime
similarity index 100%
rename from SmtpMime
rename to src/SmtpMime
diff --git a/emailaddress.cpp b/src/emailaddress.cpp
similarity index 100%
rename from emailaddress.cpp
rename to src/emailaddress.cpp
diff --git a/emailaddress.h b/src/emailaddress.h
similarity index 100%
rename from emailaddress.h
rename to src/emailaddress.h
diff --git a/mimeattachment.cpp b/src/mimeattachment.cpp
similarity index 100%
rename from mimeattachment.cpp
rename to src/mimeattachment.cpp
diff --git a/mimeattachment.h b/src/mimeattachment.h
similarity index 100%
rename from mimeattachment.h
rename to src/mimeattachment.h
diff --git a/mimefile.cpp b/src/mimefile.cpp
similarity index 100%
rename from mimefile.cpp
rename to src/mimefile.cpp
diff --git a/mimefile.h b/src/mimefile.h
similarity index 100%
rename from mimefile.h
rename to src/mimefile.h
diff --git a/mimehtml.cpp b/src/mimehtml.cpp
similarity index 100%
rename from mimehtml.cpp
rename to src/mimehtml.cpp
diff --git a/mimehtml.h b/src/mimehtml.h
similarity index 100%
rename from mimehtml.h
rename to src/mimehtml.h
diff --git a/mimeinlinefile.cpp b/src/mimeinlinefile.cpp
similarity index 100%
rename from mimeinlinefile.cpp
rename to src/mimeinlinefile.cpp
diff --git a/mimeinlinefile.h b/src/mimeinlinefile.h
similarity index 100%
rename from mimeinlinefile.h
rename to src/mimeinlinefile.h
diff --git a/mimemessage.cpp b/src/mimemessage.cpp
similarity index 100%
rename from mimemessage.cpp
rename to src/mimemessage.cpp
diff --git a/mimemessage.h b/src/mimemessage.h
similarity index 94%
rename from mimemessage.h
rename to src/mimemessage.h
index 2afb378..f940441 100644
--- a/mimemessage.h
+++ b/src/mimemessage.h
@@ -1,8 +1,8 @@
 #ifndef MIMEMESSAGE_H
 #define MIMEMESSAGE_H
 
-#include <mimepart.h>
-#include <emailaddress.h>
+#include "mimepart.h"
+#include "emailaddress.h"
 #include <QList>
 
 class MimeMessage : public QObject
diff --git a/mimepart.cpp b/src/mimepart.cpp
similarity index 100%
rename from mimepart.cpp
rename to src/mimepart.cpp
diff --git a/mimepart.h b/src/mimepart.h
similarity index 100%
rename from mimepart.h
rename to src/mimepart.h
diff --git a/mimetext.cpp b/src/mimetext.cpp
similarity index 100%
rename from mimetext.cpp
rename to src/mimetext.cpp
diff --git a/mimetext.h b/src/mimetext.h
similarity index 100%
rename from mimetext.h
rename to src/mimetext.h
diff --git a/smtpclient.cpp b/src/smtpclient.cpp
similarity index 100%
rename from smtpclient.cpp
rename to src/smtpclient.cpp
diff --git a/smtpclient.h b/src/smtpclient.h
similarity index 100%
rename from smtpclient.h
rename to src/smtpclient.h