diff --git a/ChangeLog b/ChangeLog
index b9d828f6..f23bd347 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,11 @@ VERSION 0.6.1-cvs
 
 2004-12-26  Vincent Richard  <vincent@vincent-richard.net>
 
- * Removed relative paths from #include's.
+ * Removed relative paths from #include's and moved all header files
+   to 'vmime/' directory.
+
+ * Renamed main VMime include from 'vmime' to 'vmime.hpp'. So, in your
+   program, you have to #include <vmime/vmime.hpp>.
 
  * Added support for 'pkg-config'.
 
diff --git a/SConstruct b/SConstruct
index ec5dd760..2f8679ac 100644
--- a/SConstruct
+++ b/SConstruct
@@ -86,7 +86,7 @@ libvmime_sources = [
 	'typeAdapter.cpp', 'typeAdapter.hpp',
 	'types.hpp',
 	'word.cpp', 'word.hpp',
-	'vmime',
+	'vmime.hpp',
 	'utility/file.hpp',
 	'utility/md5.cpp', 'utility/md5.hpp',
 	'utility/path.cpp', 'utility/path.hpp',
@@ -249,15 +249,25 @@ libvmimetest_sources = [
 libvmime_dist_files = libvmime_sources + libvmime_messaging_sources
 
 for i in range(len(libvmime_dist_files)):
-	libvmime_dist_files[i] = 'src/' + libvmime_dist_files[i]
+	f = libvmime_dist_files[i]
+	if f[-4:] == '.hpp':
+		libvmime_dist_files[i] = 'vmime/' + f
+	else:
+		libvmime_dist_files[i] = 'src/' + f
 
 for p in libvmime_messaging_proto_sources:
 	for f in p[1]:
-		libvmime_dist_files.append('src/' + f)
+		if f[-4:] == '.hpp':
+			libvmime_dist_files.append('vmime/' + f)
+		else:
+			libvmime_dist_files.append('src/' + f)
 
 for p in libvmime_platforms_sources:
 	for f in libvmime_platforms_sources[p]:
-		libvmime_dist_files.append('src/' + f)
+		if f[-4:] == '.hpp':
+			libvmime_dist_files.append('vmime/' + f)
+		else:
+			libvmime_dist_files.append('src/' + f)
 
 libvmime_dist_files = libvmime_dist_files + libvmime_extra + libvmime_examples_sources
 
@@ -426,7 +436,7 @@ env = Environment(options = opts)
 env.Append(ENV = os.environ)
 env.Append(ENV = {'PATH' : os.environ['PATH']})
 
-env.Append(CPPPATH = [ '.', 'src' ])
+env.Append(CPPPATH = [ '.' ])
 
 env.Append(CPPDEFINES = { '_REENTRANT' : 1 })
 
@@ -518,7 +528,7 @@ if env['with_messaging'] == 'yes':
 #  Generate config.hpp  #
 #########################
 
-config_hpp = open('src/config.hpp', 'w')
+config_hpp = open('vmime/config.hpp', 'w')
 
 config_hpp.write("""
 //
@@ -663,11 +673,11 @@ for file in libvmime_full_sources:
 	if slash != -1:
 		dir = file[0:slash] + '/'
 
-	if file[-4:] == '.cpp':
-		libvmime_sources_CPP.append(buildDirectory + file)
-	else:
+	if file[-4:] == '.hpp':
 		libvmime_sources_HPP.append(buildDirectory + file)
-		libvmime_install_includes.append([dir, buildDirectory + file])
+		libvmime_install_includes.append([dir, 'vmime/' + file])
+	else:
+		libvmime_sources_CPP.append(buildDirectory + file)
 
 # HACK: SCons does not allow '.' in target name, so we have to
 # detect the suffix for library name and add it ourself
@@ -704,7 +714,7 @@ for platform in libvmime_platforms_sources:
 			dir = file[0:slash] + '/'
 
 		if file[-4:] == '.hpp':
-			libvmime_install_includes.append([dir, buildDirectory + file])
+			libvmime_install_includes.append([dir, 'vmime/' + file])
 
 # Platform libraries
 platformLibraries = [ ]
@@ -769,7 +779,7 @@ for i in range(len(libvmime_install_includes)):
 	env.Install(includeDir + '/' + libvmime_install_includes[i][0], libvmime_install_includes[i][1])
 
 # Configuration header file
-env.Install(includeDir, 'src/config.hpp')
+env.Install(includeDir, 'vmime/config.hpp')
 
 # Pkg-config support
 vmime_pc = open(versionedPackageName + ".pc", 'w')
diff --git a/examples/example1.cpp b/examples/example1.cpp
index 24a50b2b..eb235461 100644
--- a/examples/example1.cpp
+++ b/examples/example1.cpp
@@ -29,8 +29,8 @@
 
 #include <iostream>
 
-#include "../src/vmime"
-#include "../src/platforms/posix/handler.hpp"
+#include "vmime/vmime.hpp"
+#include "vmime/platforms/posix/handler.hpp"
 
 
 int main()
diff --git a/examples/example2.cpp b/examples/example2.cpp
index 6534d7e8..6cc51200 100644
--- a/examples/example2.cpp
+++ b/examples/example2.cpp
@@ -29,8 +29,8 @@
 
 #include <iostream>
 
-#include "../src/vmime"
-#include "../src/platforms/posix/handler.hpp"
+#include "vmime/vmime.hpp"
+#include "vmime/platforms/posix/handler.hpp"
 
 
 int main()
diff --git a/examples/example3.cpp b/examples/example3.cpp
index 839c1ad7..f372ed70 100644
--- a/examples/example3.cpp
+++ b/examples/example3.cpp
@@ -29,8 +29,8 @@
 
 #include <iostream>
 
-#include "../src/vmime"
-#include "../src/platforms/posix/handler.hpp"
+#include "vmime/vmime.hpp"
+#include "vmime/platforms/posix/handler.hpp"
 
 
 int main()
diff --git a/examples/example4.cpp b/examples/example4.cpp
index 9cb774e7..69c94bb3 100644
--- a/examples/example4.cpp
+++ b/examples/example4.cpp
@@ -28,8 +28,8 @@
 
 #include <iostream>
 
-#include "../src/vmime"
-#include "../src/platforms/posix/handler.hpp"
+#include "vmime/vmime.hpp"
+#include "vmime/platforms/posix/handler.hpp"
 
 
 int main()
diff --git a/examples/example5.cpp b/examples/example5.cpp
index 7885bd88..3d26b577 100644
--- a/examples/example5.cpp
+++ b/examples/example5.cpp
@@ -29,8 +29,8 @@
 
 #include <iostream>
 
-#include "../src/vmime"
-#include "../src/platforms/posix/handler.hpp"
+#include "vmime/vmime.hpp"
+#include "vmime/platforms/posix/handler.hpp"
 
 
 int main()
diff --git a/examples/example6.cpp b/examples/example6.cpp
index 465cf854..3b05dde1 100644
--- a/examples/example6.cpp
+++ b/examples/example6.cpp
@@ -19,8 +19,8 @@
 
 #include <iostream>
 
-#include "../src/vmime"
-#include "../src/platforms/posix/handler.hpp"
+#include "vmime/vmime.hpp"
+#include "vmime/platforms/posix/handler.hpp"
 
 
 //
diff --git a/src/address.cpp b/src/address.cpp
index f37918f5..d8a35cf4 100644
--- a/src/address.cpp
+++ b/src/address.cpp
@@ -17,12 +17,12 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "address.hpp"
+#include "vmime/address.hpp"
 
-#include "mailbox.hpp"
-#include "mailboxGroup.hpp"
+#include "vmime/mailbox.hpp"
+#include "vmime/mailboxGroup.hpp"
 
-#include "parserHelpers.hpp"
+#include "vmime/parserHelpers.hpp"
 
 
 namespace vmime
diff --git a/src/addressList.cpp b/src/addressList.cpp
index 2ac24776..0bee2f09 100644
--- a/src/addressList.cpp
+++ b/src/addressList.cpp
@@ -17,10 +17,10 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "addressList.hpp"
-#include "parserHelpers.hpp"
-#include "exception.hpp"
-#include "mailboxList.hpp"
+#include "vmime/addressList.hpp"
+#include "vmime/parserHelpers.hpp"
+#include "vmime/exception.hpp"
+#include "vmime/mailboxList.hpp"
 
 
 namespace vmime
diff --git a/src/base.cpp b/src/base.cpp
index b6d752d3..9c9d73de 100644
--- a/src/base.cpp
+++ b/src/base.cpp
@@ -17,30 +17,30 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "config.hpp"
+#include "vmime/config.hpp"
 
-#include "charset.hpp"
-#include "base.hpp"
+#include "vmime/charset.hpp"
+#include "vmime/base.hpp"
 
-#include "encoder.hpp"
-#include "encoderB64.hpp"
-#include "encoderQP.hpp"
+#include "vmime/encoder.hpp"
+#include "vmime/encoderB64.hpp"
+#include "vmime/encoderQP.hpp"
 
-#include "text.hpp"
+#include "vmime/text.hpp"
 
-#include "parserHelpers.hpp"
+#include "vmime/parserHelpers.hpp"
 
-#include "utility/stringUtils.hpp"
+#include "vmime/utility/stringUtils.hpp"
 
 // For initializing
-#include "encoderFactory.hpp"
-#include "headerFieldFactory.hpp"
-#include "parameterFactory.hpp"
-#include "textPartFactory.hpp"
-#include "options.hpp"
+#include "vmime/encoderFactory.hpp"
+#include "vmime/headerFieldFactory.hpp"
+#include "vmime/parameterFactory.hpp"
+#include "vmime/textPartFactory.hpp"
+#include "vmime/options.hpp"
 
 #if VMIME_HAVE_MESSAGING_FEATURES
-	#include "messaging/serviceFactory.hpp"
+	#include "vmime/messaging/serviceFactory.hpp"
 #endif
 
 
diff --git a/src/body.cpp b/src/body.cpp
index dca3409a..414b36ce 100644
--- a/src/body.cpp
+++ b/src/body.cpp
@@ -17,16 +17,16 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "bodyPart.hpp"
-#include "body.hpp"
+#include "vmime/bodyPart.hpp"
+#include "vmime/body.hpp"
 
-#include "options.hpp"
+#include "vmime/options.hpp"
 
-#include "contentTypeField.hpp"
+#include "vmime/contentTypeField.hpp"
 
-#include "utility/random.hpp"
+#include "vmime/utility/random.hpp"
 
-#include "parserHelpers.hpp"
+#include "vmime/parserHelpers.hpp"
 
 
 namespace vmime
diff --git a/src/bodyPart.cpp b/src/bodyPart.cpp
index 45998aea..51eaef90 100644
--- a/src/bodyPart.cpp
+++ b/src/bodyPart.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "bodyPart.hpp"
+#include "vmime/bodyPart.hpp"
 
 
 namespace vmime
diff --git a/src/charset.cpp b/src/charset.cpp
index 0ec050a8..4d2e005a 100644
--- a/src/charset.cpp
+++ b/src/charset.cpp
@@ -17,11 +17,11 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "charset.hpp"
-#include "exception.hpp"
-#include "platformDependant.hpp"
+#include "vmime/charset.hpp"
+#include "vmime/exception.hpp"
+#include "vmime/platformDependant.hpp"
 
-#include "utility/stringUtils.hpp"
+#include "vmime/utility/stringUtils.hpp"
 
 
 extern "C"
diff --git a/src/component.cpp b/src/component.cpp
index cbedac63..a13765a3 100644
--- a/src/component.cpp
+++ b/src/component.cpp
@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "component.hpp"
-#include "base.hpp"
+#include "vmime/component.hpp"
+#include "vmime/base.hpp"
 
 #include <sstream>
 
diff --git a/src/constants.cpp b/src/constants.cpp
index d59fea05..a77f8ea7 100644
--- a/src/constants.cpp
+++ b/src/constants.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "constants.hpp"
+#include "vmime/constants.hpp"
 
 
 namespace vmime
diff --git a/src/contentDisposition.cpp b/src/contentDisposition.cpp
index 74fd42ae..3eb8aad8 100644
--- a/src/contentDisposition.cpp
+++ b/src/contentDisposition.cpp
@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "contentDisposition.hpp"
-#include "utility/stringUtils.hpp"
+#include "vmime/contentDisposition.hpp"
+#include "vmime/utility/stringUtils.hpp"
 
 
 namespace vmime
diff --git a/src/contentDispositionField.cpp b/src/contentDispositionField.cpp
index a4a4c623..03c0027d 100644
--- a/src/contentDispositionField.cpp
+++ b/src/contentDispositionField.cpp
@@ -17,10 +17,10 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "contentDispositionField.hpp"
-#include "exception.hpp"
+#include "vmime/contentDispositionField.hpp"
+#include "vmime/exception.hpp"
 
-#include "standardParams.hpp"
+#include "vmime/standardParams.hpp"
 
 
 namespace vmime
diff --git a/src/contentHandler.cpp b/src/contentHandler.cpp
index 195055ed..8c35ebaa 100644
--- a/src/contentHandler.cpp
+++ b/src/contentHandler.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "contentHandler.hpp"
+#include "vmime/contentHandler.hpp"
 
 
 namespace vmime
diff --git a/src/contentTypeField.cpp b/src/contentTypeField.cpp
index 69da97ae..2ced531a 100644
--- a/src/contentTypeField.cpp
+++ b/src/contentTypeField.cpp
@@ -17,10 +17,10 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "contentTypeField.hpp"
-#include "exception.hpp"
+#include "vmime/contentTypeField.hpp"
+#include "vmime/exception.hpp"
 
-#include "standardParams.hpp"
+#include "vmime/standardParams.hpp"
 
 
 namespace vmime
diff --git a/src/dateTime.cpp b/src/dateTime.cpp
index 08ad89e9..11a9d43d 100644
--- a/src/dateTime.cpp
+++ b/src/dateTime.cpp
@@ -19,9 +19,9 @@
 
 #include <iomanip>
 
-#include "dateTime.hpp"
-#include "platformDependant.hpp"
-#include "parserHelpers.hpp"
+#include "vmime/dateTime.hpp"
+#include "vmime/platformDependant.hpp"
+#include "vmime/parserHelpers.hpp"
 
 
 namespace vmime
diff --git a/src/defaultAttachment.cpp b/src/defaultAttachment.cpp
index 48fbcdbb..80d251f0 100644
--- a/src/defaultAttachment.cpp
+++ b/src/defaultAttachment.cpp
@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "defaultAttachment.hpp"
-#include "encoding.hpp"
+#include "vmime/defaultAttachment.hpp"
+#include "vmime/encoding.hpp"
 
 
 namespace vmime
diff --git a/src/encoder.cpp b/src/encoder.cpp
index 9fabd5a8..3acbb8f6 100644
--- a/src/encoder.cpp
+++ b/src/encoder.cpp
@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "encoder.hpp"
-#include "exception.hpp"
+#include "vmime/encoder.hpp"
+#include "vmime/exception.hpp"
 
 
 namespace vmime
diff --git a/src/encoder7bit.cpp b/src/encoder7bit.cpp
index b5ae3820..8609e61b 100644
--- a/src/encoder7bit.cpp
+++ b/src/encoder7bit.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "encoder7bit.hpp"
+#include "vmime/encoder7bit.hpp"
 
 
 namespace vmime
diff --git a/src/encoder8bit.cpp b/src/encoder8bit.cpp
index b9b91457..6a7463e2 100644
--- a/src/encoder8bit.cpp
+++ b/src/encoder8bit.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "encoder8bit.hpp"
+#include "vmime/encoder8bit.hpp"
 
 
 namespace vmime
diff --git a/src/encoderB64.cpp b/src/encoderB64.cpp
index c45d719f..79ed4418 100644
--- a/src/encoderB64.cpp
+++ b/src/encoderB64.cpp
@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "encoderB64.hpp"
-#include "parserHelpers.hpp"
+#include "vmime/encoderB64.hpp"
+#include "vmime/parserHelpers.hpp"
 
 
 namespace vmime
diff --git a/src/encoderBinary.cpp b/src/encoderBinary.cpp
index 606da99c..0d5878a6 100644
--- a/src/encoderBinary.cpp
+++ b/src/encoderBinary.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "encoderBinary.hpp"
+#include "vmime/encoderBinary.hpp"
 
 
 namespace vmime
diff --git a/src/encoderDefault.cpp b/src/encoderDefault.cpp
index cdff3735..df689e82 100644
--- a/src/encoderDefault.cpp
+++ b/src/encoderDefault.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "encoderDefault.hpp"
+#include "vmime/encoderDefault.hpp"
 
 
 namespace vmime
diff --git a/src/encoderFactory.cpp b/src/encoderFactory.cpp
index 15c9e959..f73421eb 100644
--- a/src/encoderFactory.cpp
+++ b/src/encoderFactory.cpp
@@ -17,15 +17,15 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "encoderFactory.hpp"
-#include "exception.hpp"
+#include "vmime/encoderFactory.hpp"
+#include "vmime/exception.hpp"
 
-#include "encoderB64.hpp"
-#include "encoderQP.hpp"
-#include "encoderUUE.hpp"
-#include "encoderBinary.hpp"
-#include "encoder7bit.hpp"
-#include "encoder8bit.hpp"
+#include "vmime/encoderB64.hpp"
+#include "vmime/encoderQP.hpp"
+#include "vmime/encoderUUE.hpp"
+#include "vmime/encoderBinary.hpp"
+#include "vmime/encoder7bit.hpp"
+#include "vmime/encoder8bit.hpp"
 
 
 namespace vmime
diff --git a/src/encoderQP.cpp b/src/encoderQP.cpp
index d37ac351..6ae9de64 100644
--- a/src/encoderQP.cpp
+++ b/src/encoderQP.cpp
@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "encoderQP.hpp"
-#include "parserHelpers.hpp"
+#include "vmime/encoderQP.hpp"
+#include "vmime/parserHelpers.hpp"
 
 
 namespace vmime
diff --git a/src/encoderUUE.cpp b/src/encoderUUE.cpp
index dbc31ce8..26c0410f 100644
--- a/src/encoderUUE.cpp
+++ b/src/encoderUUE.cpp
@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "encoderUUE.hpp"
-#include "parserHelpers.hpp"
+#include "vmime/encoderUUE.hpp"
+#include "vmime/parserHelpers.hpp"
 
 
 namespace vmime
diff --git a/src/encoding.cpp b/src/encoding.cpp
index 4b270c8d..2ccded09 100644
--- a/src/encoding.cpp
+++ b/src/encoding.cpp
@@ -17,9 +17,9 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "encoding.hpp"
-#include "encoderFactory.hpp"
-#include "contentHandler.hpp"
+#include "vmime/encoding.hpp"
+#include "vmime/encoderFactory.hpp"
+#include "vmime/contentHandler.hpp"
 
 #include <algorithm>
 
diff --git a/src/exception.cpp b/src/exception.cpp
index 9dc71c81..8a339a9a 100644
--- a/src/exception.cpp
+++ b/src/exception.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "exception.hpp"
+#include "vmime/exception.hpp"
 
 
 namespace vmime {
diff --git a/src/fileAttachment.cpp b/src/fileAttachment.cpp
index d13eb3de..04e85123 100644
--- a/src/fileAttachment.cpp
+++ b/src/fileAttachment.cpp
@@ -20,8 +20,8 @@
 #include <fstream>
 #include <sstream>
 
-#include "fileAttachment.hpp"
-#include "exception.hpp"
+#include "vmime/fileAttachment.hpp"
+#include "vmime/exception.hpp"
 
 
 namespace vmime
diff --git a/src/header.cpp b/src/header.cpp
index 492b4576..67435241 100644
--- a/src/header.cpp
+++ b/src/header.cpp
@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "header.hpp"
-#include "parserHelpers.hpp"
+#include "vmime/header.hpp"
+#include "vmime/parserHelpers.hpp"
 
 
 namespace vmime
diff --git a/src/headerField.cpp b/src/headerField.cpp
index 0efcd0a3..39809d23 100644
--- a/src/headerField.cpp
+++ b/src/headerField.cpp
@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "headerField.hpp"
-#include "headerFieldFactory.hpp"
+#include "vmime/headerField.hpp"
+#include "vmime/headerFieldFactory.hpp"
 
 
 namespace vmime
diff --git a/src/headerFieldFactory.cpp b/src/headerFieldFactory.cpp
index 19862b6a..9f6916e4 100644
--- a/src/headerFieldFactory.cpp
+++ b/src/headerFieldFactory.cpp
@@ -17,14 +17,14 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "headerFieldFactory.hpp"
-#include "exception.hpp"
+#include "vmime/headerFieldFactory.hpp"
+#include "vmime/exception.hpp"
 
-#include "standardFields.hpp"
+#include "vmime/standardFields.hpp"
 
-#include "mailboxField.hpp"
-#include "contentTypeField.hpp"
-#include "contentDispositionField.hpp"
+#include "vmime/mailboxField.hpp"
+#include "vmime/contentTypeField.hpp"
+#include "vmime/contentDispositionField.hpp"
 
 
 namespace vmime
diff --git a/src/htmlTextPart.cpp b/src/htmlTextPart.cpp
index fd39c78b..919125fe 100644
--- a/src/htmlTextPart.cpp
+++ b/src/htmlTextPart.cpp
@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "htmlTextPart.hpp"
-#include "exception.hpp"
+#include "vmime/htmlTextPart.hpp"
+#include "vmime/exception.hpp"
 
 
 namespace vmime
diff --git a/src/mailbox.cpp b/src/mailbox.cpp
index 65031064..e9235eb5 100644
--- a/src/mailbox.cpp
+++ b/src/mailbox.cpp
@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "mailbox.hpp"
-#include "parserHelpers.hpp"
+#include "vmime/mailbox.hpp"
+#include "vmime/parserHelpers.hpp"
 
 
 namespace vmime
diff --git a/src/mailboxField.cpp b/src/mailboxField.cpp
index f9ad2f8f..d5381769 100644
--- a/src/mailboxField.cpp
+++ b/src/mailboxField.cpp
@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "mailboxField.hpp"
-#include "mailboxGroup.hpp"
+#include "vmime/mailboxField.hpp"
+#include "vmime/mailboxGroup.hpp"
 
 
 namespace vmime
diff --git a/src/mailboxGroup.cpp b/src/mailboxGroup.cpp
index 7b830030..6ca84d10 100644
--- a/src/mailboxGroup.cpp
+++ b/src/mailboxGroup.cpp
@@ -17,9 +17,9 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "mailboxGroup.hpp"
-#include "parserHelpers.hpp"
-#include "exception.hpp"
+#include "vmime/mailboxGroup.hpp"
+#include "vmime/parserHelpers.hpp"
+#include "vmime/exception.hpp"
 
 
 namespace vmime
diff --git a/src/mailboxList.cpp b/src/mailboxList.cpp
index f8944e29..59e46c9b 100644
--- a/src/mailboxList.cpp
+++ b/src/mailboxList.cpp
@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "mailboxList.hpp"
-#include "exception.hpp"
+#include "vmime/mailboxList.hpp"
+#include "vmime/exception.hpp"
 
 
 namespace vmime
diff --git a/src/mediaType.cpp b/src/mediaType.cpp
index 0bf74c95..1c350dac 100644
--- a/src/mediaType.cpp
+++ b/src/mediaType.cpp
@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "mediaType.hpp"
-#include "parserHelpers.hpp"
+#include "vmime/mediaType.hpp"
+#include "vmime/parserHelpers.hpp"
 
 
 namespace vmime
diff --git a/src/message.cpp b/src/message.cpp
index bd6f6085..8b28039a 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "message.hpp"
-#include "options.hpp"
+#include "vmime/message.hpp"
+#include "vmime/options.hpp"
 
 #include <sstream>
 
diff --git a/src/messageBuilder.cpp b/src/messageBuilder.cpp
index c15532e6..f29ffe6c 100644
--- a/src/messageBuilder.cpp
+++ b/src/messageBuilder.cpp
@@ -17,9 +17,9 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messageBuilder.hpp"
+#include "vmime/messageBuilder.hpp"
 
-#include "textPartFactory.hpp"
+#include "vmime/textPartFactory.hpp"
 
 
 namespace vmime
diff --git a/src/messageId.cpp b/src/messageId.cpp
index 35ab76b6..dfa9b307 100644
--- a/src/messageId.cpp
+++ b/src/messageId.cpp
@@ -17,10 +17,10 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messageId.hpp"
-#include "utility/random.hpp"
-#include "platformDependant.hpp"
-#include "parserHelpers.hpp"
+#include "vmime/messageId.hpp"
+#include "vmime/utility/random.hpp"
+#include "vmime/platformDependant.hpp"
+#include "vmime/parserHelpers.hpp"
 
 
 namespace vmime
diff --git a/src/messageParser.cpp b/src/messageParser.cpp
index 2834fc18..6099ef33 100644
--- a/src/messageParser.cpp
+++ b/src/messageParser.cpp
@@ -17,10 +17,10 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messageParser.hpp"
+#include "vmime/messageParser.hpp"
 
-#include "defaultAttachment.hpp"
-#include "textPartFactory.hpp"
+#include "vmime/defaultAttachment.hpp"
+#include "vmime/textPartFactory.hpp"
 
 
 namespace vmime
diff --git a/src/messaging/IMAPConnection.cpp b/src/messaging/IMAPConnection.cpp
index 7992db3c..d6f79ed3 100644
--- a/src/messaging/IMAPConnection.cpp
+++ b/src/messaging/IMAPConnection.cpp
@@ -17,13 +17,13 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/IMAPTag.hpp"
-#include "messaging/IMAPConnection.hpp"
-#include "messaging/IMAPUtils.hpp"
-#include "messaging/IMAPStore.hpp"
+#include "vmime/messaging/IMAPTag.hpp"
+#include "vmime/messaging/IMAPConnection.hpp"
+#include "vmime/messaging/IMAPUtils.hpp"
+#include "vmime/messaging/IMAPStore.hpp"
 
-#include "exception.hpp"
-#include "platformDependant.hpp"
+#include "vmime/exception.hpp"
+#include "vmime/platformDependant.hpp"
 
 #include <sstream>
 
diff --git a/src/messaging/IMAPFolder.cpp b/src/messaging/IMAPFolder.cpp
index a60ea40b..ce5b5236 100644
--- a/src/messaging/IMAPFolder.cpp
+++ b/src/messaging/IMAPFolder.cpp
@@ -17,18 +17,18 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/IMAPFolder.hpp"
+#include "vmime/messaging/IMAPFolder.hpp"
 
-#include "messaging/IMAPStore.hpp"
-#include "messaging/IMAPParser.hpp"
-#include "messaging/IMAPMessage.hpp"
-#include "messaging/IMAPUtils.hpp"
-#include "messaging/IMAPConnection.hpp"
+#include "vmime/messaging/IMAPStore.hpp"
+#include "vmime/messaging/IMAPParser.hpp"
+#include "vmime/messaging/IMAPMessage.hpp"
+#include "vmime/messaging/IMAPUtils.hpp"
+#include "vmime/messaging/IMAPConnection.hpp"
 
-#include "messageParser.hpp"   // to include "message.hpp" in root directory
+#include "vmime/message.hpp"
 
-#include "exception.hpp"
-#include "utility/smartPtr.hpp"
+#include "vmime/exception.hpp"
+#include "vmime/utility/smartPtr.hpp"
 
 #include <algorithm>
 #include <sstream>
diff --git a/src/messaging/IMAPMessage.cpp b/src/messaging/IMAPMessage.cpp
index deb0087d..85833352 100644
--- a/src/messaging/IMAPMessage.cpp
+++ b/src/messaging/IMAPMessage.cpp
@@ -17,12 +17,12 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/IMAPParser.hpp"
-#include "messaging/IMAPMessage.hpp"
-#include "messaging/IMAPFolder.hpp"
-#include "messaging/IMAPStore.hpp"
-#include "messaging/IMAPConnection.hpp"
-#include "messaging/IMAPUtils.hpp"
+#include "vmime/messaging/IMAPParser.hpp"
+#include "vmime/messaging/IMAPMessage.hpp"
+#include "vmime/messaging/IMAPFolder.hpp"
+#include "vmime/messaging/IMAPStore.hpp"
+#include "vmime/messaging/IMAPConnection.hpp"
+#include "vmime/messaging/IMAPUtils.hpp"
 
 #include <sstream>
 #include <iterator>
diff --git a/src/messaging/IMAPStore.cpp b/src/messaging/IMAPStore.cpp
index 482c559f..4ac50764 100644
--- a/src/messaging/IMAPStore.cpp
+++ b/src/messaging/IMAPStore.cpp
@@ -17,12 +17,12 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/IMAPStore.hpp"
-#include "messaging/IMAPFolder.hpp"
-#include "messaging/IMAPConnection.hpp"
+#include "vmime/messaging/IMAPStore.hpp"
+#include "vmime/messaging/IMAPFolder.hpp"
+#include "vmime/messaging/IMAPConnection.hpp"
 
-#include "exception.hpp"
-#include "platformDependant.hpp"
+#include "vmime/exception.hpp"
+#include "vmime/platformDependant.hpp"
 
 #include <map>
 
diff --git a/src/messaging/IMAPTag.cpp b/src/messaging/IMAPTag.cpp
index 12194bce..549abfcc 100644
--- a/src/messaging/IMAPTag.cpp
+++ b/src/messaging/IMAPTag.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/IMAPTag.hpp"
+#include "vmime/messaging/IMAPTag.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/IMAPUtils.cpp b/src/messaging/IMAPUtils.cpp
index e04ee2ce..ef25c103 100644
--- a/src/messaging/IMAPUtils.cpp
+++ b/src/messaging/IMAPUtils.cpp
@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/IMAPUtils.hpp"
-#include "messaging/message.hpp"
+#include "vmime/messaging/IMAPUtils.hpp"
+#include "vmime/messaging/message.hpp"
 
 #include <sstream>
 #include <iterator>
diff --git a/src/messaging/POP3Folder.cpp b/src/messaging/POP3Folder.cpp
index d1c501ca..61e3475b 100644
--- a/src/messaging/POP3Folder.cpp
+++ b/src/messaging/POP3Folder.cpp
@@ -17,12 +17,12 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/POP3Folder.hpp"
+#include "vmime/messaging/POP3Folder.hpp"
 
-#include "messaging/POP3Store.hpp"
-#include "messaging/POP3Message.hpp"
+#include "vmime/messaging/POP3Store.hpp"
+#include "vmime/messaging/POP3Message.hpp"
 
-#include "exception.hpp"
+#include "vmime/exception.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/POP3Message.cpp b/src/messaging/POP3Message.cpp
index f23994cd..ac3aa120 100644
--- a/src/messaging/POP3Message.cpp
+++ b/src/messaging/POP3Message.cpp
@@ -17,9 +17,9 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/POP3Message.hpp"
-#include "messaging/POP3Folder.hpp"
-#include "messaging/POP3Store.hpp"
+#include "vmime/messaging/POP3Message.hpp"
+#include "vmime/messaging/POP3Folder.hpp"
+#include "vmime/messaging/POP3Store.hpp"
 
 #include <sstream>
 
diff --git a/src/messaging/POP3Store.cpp b/src/messaging/POP3Store.cpp
index d5b4ec12..21e09f77 100644
--- a/src/messaging/POP3Store.cpp
+++ b/src/messaging/POP3Store.cpp
@@ -17,13 +17,13 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/POP3Store.hpp"
-#include "messaging/POP3Folder.hpp"
+#include "vmime/messaging/POP3Store.hpp"
+#include "vmime/messaging/POP3Folder.hpp"
 
-#include "exception.hpp"
-#include "platformDependant.hpp"
-#include "messageId.hpp"
-#include "utility/md5.hpp"
+#include "vmime/exception.hpp"
+#include "vmime/platformDependant.hpp"
+#include "vmime/messageId.hpp"
+#include "vmime/utility/md5.hpp"
 
 #include <algorithm>
 
diff --git a/src/messaging/SMTPTransport.cpp b/src/messaging/SMTPTransport.cpp
index 54ffe546..0ba8ebd0 100644
--- a/src/messaging/SMTPTransport.cpp
+++ b/src/messaging/SMTPTransport.cpp
@@ -17,15 +17,15 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/SMTPTransport.hpp"
+#include "vmime/messaging/SMTPTransport.hpp"
 
-#include "exception.hpp"
-#include "platformDependant.hpp"
-#include "encoderB64.hpp"
-#include "messageParser.hpp"   // to include "message.hpp" in root directory
-#include "mailboxList.hpp"
+#include "vmime/exception.hpp"
+#include "vmime/platformDependant.hpp"
+#include "vmime/encoderB64.hpp"
+#include "vmime/message.hpp"
+#include "vmime/mailboxList.hpp"
 
-#include "messaging/authHelper.hpp"
+#include "vmime/messaging/authHelper.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/authHelper.cpp b/src/messaging/authHelper.cpp
index 0bd1c99e..5ddb8111 100644
--- a/src/messaging/authHelper.cpp
+++ b/src/messaging/authHelper.cpp
@@ -17,10 +17,10 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/authHelper.hpp"
+#include "vmime/messaging/authHelper.hpp"
 
-#include "config.hpp"
-#include "utility/md5.hpp"
+#include "vmime/config.hpp"
+#include "vmime/utility/md5.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/authenticationInfos.cpp b/src/messaging/authenticationInfos.cpp
index 3bc572d6..06e4745e 100644
--- a/src/messaging/authenticationInfos.cpp
+++ b/src/messaging/authenticationInfos.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/authenticationInfos.hpp"
+#include "vmime/messaging/authenticationInfos.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/authenticator.cpp b/src/messaging/authenticator.cpp
index 87823d4f..c8c4bbc1 100644
--- a/src/messaging/authenticator.cpp
+++ b/src/messaging/authenticator.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/authenticator.hpp"
+#include "vmime/messaging/authenticator.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/builtinServices.inl b/src/messaging/builtinServices.inl
index 77809234..e330cad9 100644
--- a/src/messaging/builtinServices.inl
+++ b/src/messaging/builtinServices.inl
@@ -25,25 +25,25 @@
 
 
 #if VMIME_BUILTIN_MESSAGING_PROTO_POP3
-	#include "POP3Store.hpp"
+	#include "vmime/messaging/POP3Store.hpp"
 	REGISTER_SERVICE(POP3Store, pop3);
 #endif
 
 
 #if VMIME_BUILTIN_MESSAGING_PROTO_SMTP
-	#include "SMTPTransport.hpp"
+	#include "vmime/messaging/SMTPTransport.hpp"
 	REGISTER_SERVICE(SMTPTransport, smtp);
 #endif
 
 
 #if VMIME_BUILTIN_MESSAGING_PROTO_IMAP
-	#include "IMAPStore.hpp"
+	#include "vmime/messaging/IMAPStore.hpp"
 	REGISTER_SERVICE(IMAPStore, imap);
 #endif
 
 
 #if VMIME_BUILTIN_MESSAGING_PROTO_MAILDIR
-	#include "maildirStore.hpp"
+	#include "vmime/messaging/maildirStore.hpp"
 	REGISTER_SERVICE(maildirStore, maildir);
 #endif
 
diff --git a/src/messaging/defaultAuthenticator.cpp b/src/messaging/defaultAuthenticator.cpp
index 4ecf8ed4..72273ac4 100644
--- a/src/messaging/defaultAuthenticator.cpp
+++ b/src/messaging/defaultAuthenticator.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/defaultAuthenticator.hpp"
+#include "vmime/messaging/defaultAuthenticator.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/events.cpp b/src/messaging/events.cpp
index 7bbd6f77..90dbf797 100644
--- a/src/messaging/events.cpp
+++ b/src/messaging/events.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/events.hpp"
+#include "vmime/messaging/events.hpp"
 
 #include <algorithm>
 
diff --git a/src/messaging/folder.cpp b/src/messaging/folder.cpp
index 21514672..f14eb525 100644
--- a/src/messaging/folder.cpp
+++ b/src/messaging/folder.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/folder.hpp"
+#include "vmime/messaging/folder.hpp"
 
 #include <algorithm>
 
diff --git a/src/messaging/maildirFolder.cpp b/src/messaging/maildirFolder.cpp
index e12b7c43..19153907 100644
--- a/src/messaging/maildirFolder.cpp
+++ b/src/messaging/maildirFolder.cpp
@@ -17,18 +17,18 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/maildirFolder.hpp"
+#include "vmime/messaging/maildirFolder.hpp"
 
-#include "messaging/maildirStore.hpp"
-#include "messaging/maildirMessage.hpp"
-#include "messaging/maildirUtils.hpp"
+#include "vmime/messaging/maildirStore.hpp"
+#include "vmime/messaging/maildirMessage.hpp"
+#include "vmime/messaging/maildirUtils.hpp"
 
-#include "utility/smartPtr.hpp"
+#include "vmime/utility/smartPtr.hpp"
 
-#include "messageParser.hpp"   // to include "message.hpp" in root directory
+#include "vmime/message.hpp"
 
-#include "exception.hpp"
-#include "platformDependant.hpp"
+#include "vmime/exception.hpp"
+#include "vmime/platformDependant.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/maildirMessage.cpp b/src/messaging/maildirMessage.cpp
index 17f595fb..7145123b 100644
--- a/src/messaging/maildirMessage.cpp
+++ b/src/messaging/maildirMessage.cpp
@@ -17,14 +17,14 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/maildirMessage.hpp"
-#include "messaging/maildirFolder.hpp"
-#include "messaging/maildirUtils.hpp"
+#include "vmime/messaging/maildirMessage.hpp"
+#include "vmime/messaging/maildirFolder.hpp"
+#include "vmime/messaging/maildirUtils.hpp"
 
-#include "messageParser.hpp"   // to include "message.hpp" in root directory
+#include "vmime/messageParser.hpp"   // to include "message.hpp" in root directory
 
-#include "exception.hpp"
-#include "platformDependant.hpp"
+#include "vmime/exception.hpp"
+#include "vmime/platformDependant.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/maildirStore.cpp b/src/messaging/maildirStore.cpp
index 8390117b..5f1ebb6c 100644
--- a/src/messaging/maildirStore.cpp
+++ b/src/messaging/maildirStore.cpp
@@ -17,14 +17,14 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/maildirStore.hpp"
+#include "vmime/messaging/maildirStore.hpp"
 
-#include "messaging/maildirFolder.hpp"
+#include "vmime/messaging/maildirFolder.hpp"
 
-#include "utility/smartPtr.hpp"
+#include "vmime/utility/smartPtr.hpp"
 
-#include "exception.hpp"
-#include "platformDependant.hpp"
+#include "vmime/exception.hpp"
+#include "vmime/platformDependant.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/maildirUtils.cpp b/src/messaging/maildirUtils.cpp
index 587f8f4c..71ed5593 100644
--- a/src/messaging/maildirUtils.cpp
+++ b/src/messaging/maildirUtils.cpp
@@ -17,10 +17,10 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/maildirUtils.hpp"
-#include "messaging/maildirStore.hpp"
+#include "vmime/messaging/maildirUtils.hpp"
+#include "vmime/messaging/maildirStore.hpp"
 
-#include "utility/random.hpp"
+#include "vmime/utility/random.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/message.cpp b/src/messaging/message.cpp
index cf36158b..4fcedf31 100644
--- a/src/messaging/message.cpp
+++ b/src/messaging/message.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/message.hpp"
+#include "vmime/messaging/message.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/service.cpp b/src/messaging/service.cpp
index 3b0c7ed3..6654160b 100644
--- a/src/messaging/service.cpp
+++ b/src/messaging/service.cpp
@@ -17,9 +17,9 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/service.hpp"
+#include "vmime/messaging/service.hpp"
 
-#include "messaging/defaultAuthenticator.hpp"
+#include "vmime/messaging/defaultAuthenticator.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/serviceFactory.cpp b/src/messaging/serviceFactory.cpp
index 9d51e79b..31f28b66 100644
--- a/src/messaging/serviceFactory.cpp
+++ b/src/messaging/serviceFactory.cpp
@@ -17,13 +17,13 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/serviceFactory.hpp"
-#include "messaging/service.hpp"
+#include "vmime/messaging/serviceFactory.hpp"
+#include "vmime/messaging/service.hpp"
 
-#include "exception.hpp"
-#include "config.hpp"
+#include "vmime/exception.hpp"
+#include "vmime/config.hpp"
 
-#include "messaging/builtinServices.inl"
+#include "builtinServices.inl"
 
 
 namespace vmime {
diff --git a/src/messaging/session.cpp b/src/messaging/session.cpp
index 8edfcab4..1807f408 100644
--- a/src/messaging/session.cpp
+++ b/src/messaging/session.cpp
@@ -17,11 +17,11 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/session.hpp"
-#include "messaging/serviceFactory.hpp"
+#include "vmime/messaging/session.hpp"
+#include "vmime/messaging/serviceFactory.hpp"
 
-#include "messaging/store.hpp"
-#include "messaging/transport.hpp"
+#include "vmime/messaging/store.hpp"
+#include "vmime/messaging/transport.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/simpleAuthenticator.cpp b/src/messaging/simpleAuthenticator.cpp
index abfa3086..8ed534ac 100644
--- a/src/messaging/simpleAuthenticator.cpp
+++ b/src/messaging/simpleAuthenticator.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/simpleAuthenticator.hpp"
+#include "vmime/messaging/simpleAuthenticator.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/url.cpp b/src/messaging/url.cpp
index b770482b..9d6ba0dd 100644
--- a/src/messaging/url.cpp
+++ b/src/messaging/url.cpp
@@ -17,11 +17,11 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "url.hpp"
+#include "vmime/messaging/url.hpp"
 
-#include "parserHelpers.hpp"
-#include "messaging/urlUtils.hpp"
-#include "exception.hpp"
+#include "vmime/parserHelpers.hpp"
+#include "vmime/messaging/urlUtils.hpp"
+#include "vmime/exception.hpp"
 
 #include <sstream>
 
diff --git a/src/messaging/urlUtils.cpp b/src/messaging/urlUtils.cpp
index 03b20a8f..c09ce993 100644
--- a/src/messaging/urlUtils.cpp
+++ b/src/messaging/urlUtils.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "messaging/urlUtils.hpp"
+#include "vmime/messaging/urlUtils.hpp"
 
 
 namespace vmime {
diff --git a/src/options.cpp b/src/options.cpp
index 8435f8f3..443bf38d 100644
--- a/src/options.cpp
+++ b/src/options.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "options.hpp"
+#include "vmime/options.hpp"
 
 
 namespace vmime
diff --git a/src/parameter.cpp b/src/parameter.cpp
index a47a5a1a..f541f75e 100644
--- a/src/parameter.cpp
+++ b/src/parameter.cpp
@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "parameter.hpp"
-#include "parameterFactory.hpp"
+#include "vmime/parameter.hpp"
+#include "vmime/parameterFactory.hpp"
 
 
 namespace vmime
diff --git a/src/parameterFactory.cpp b/src/parameterFactory.cpp
index ae1d470d..f1fbd0a3 100644
--- a/src/parameterFactory.cpp
+++ b/src/parameterFactory.cpp
@@ -17,10 +17,10 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "parameterFactory.hpp"
-#include "exception.hpp"
+#include "vmime/parameterFactory.hpp"
+#include "vmime/exception.hpp"
 
-#include "standardParams.hpp"
+#include "vmime/standardParams.hpp"
 
 
 namespace vmime
diff --git a/src/parameterizedHeaderField.cpp b/src/parameterizedHeaderField.cpp
index 1487abd7..f824fe11 100644
--- a/src/parameterizedHeaderField.cpp
+++ b/src/parameterizedHeaderField.cpp
@@ -17,10 +17,10 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "parameterizedHeaderField.hpp"
-#include "parameterFactory.hpp"
-#include "text.hpp"
-#include "parserHelpers.hpp"
+#include "vmime/parameterizedHeaderField.hpp"
+#include "vmime/parameterFactory.hpp"
+#include "vmime/text.hpp"
+#include "vmime/parserHelpers.hpp"
 
 
 namespace vmime
diff --git a/src/plainTextPart.cpp b/src/plainTextPart.cpp
index 8a1bf994..b8cb8224 100644
--- a/src/plainTextPart.cpp
+++ b/src/plainTextPart.cpp
@@ -17,9 +17,9 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "plainTextPart.hpp"
-#include "header.hpp"
-#include "exception.hpp"
+#include "vmime/plainTextPart.hpp"
+#include "vmime/header.hpp"
+#include "vmime/exception.hpp"
 
 
 namespace vmime
diff --git a/src/platformDependant.cpp b/src/platformDependant.cpp
index cf1ed8c1..91a9f93a 100644
--- a/src/platformDependant.cpp
+++ b/src/platformDependant.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "platformDependant.hpp"
+#include "vmime/platformDependant.hpp"
 
 
 namespace vmime
diff --git a/src/platforms/posix/file.cpp b/src/platforms/posix/file.cpp
index 463d4ca0..2854f54d 100644
--- a/src/platforms/posix/file.cpp
+++ b/src/platforms/posix/file.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "platforms/posix/file.hpp"
+#include "vmime/platforms/posix/file.hpp"
 
 #include <unistd.h>
 #include <fcntl.h>
@@ -30,7 +30,7 @@
 
 #include <string.h>
 
-#include "exception.hpp"
+#include "vmime/exception.hpp"
 
 
 #if VMIME_HAVE_FILESYSTEM_FEATURES
diff --git a/src/platforms/posix/handler.cpp b/src/platforms/posix/handler.cpp
index ddb1c421..1084d59e 100644
--- a/src/platforms/posix/handler.cpp
+++ b/src/platforms/posix/handler.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "platforms/posix/handler.hpp"
+#include "vmime/platforms/posix/handler.hpp"
 
 #include <time.h>
 
diff --git a/src/platforms/posix/socket.cpp b/src/platforms/posix/socket.cpp
index e5a07f36..fe3150bf 100644
--- a/src/platforms/posix/socket.cpp
+++ b/src/platforms/posix/socket.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "platforms/posix/socket.hpp"
+#include "vmime/platforms/posix/socket.hpp"
 
 #include <unistd.h>
 #include <sys/socket.h>
@@ -27,7 +27,7 @@
 #include <netdb.h>
 #include <fcntl.h>
 
-#include "exception.hpp"
+#include "vmime/exception.hpp"
 
 
 #if VMIME_HAVE_MESSAGING_FEATURES
diff --git a/src/propertySet.cpp b/src/propertySet.cpp
index 24ffee2c..317a5add 100644
--- a/src/propertySet.cpp
+++ b/src/propertySet.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "propertySet.hpp"
+#include "vmime/propertySet.hpp"
 
 
 namespace vmime
diff --git a/src/relay.cpp b/src/relay.cpp
index b2a4d102..14521b38 100644
--- a/src/relay.cpp
+++ b/src/relay.cpp
@@ -17,9 +17,9 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "relay.hpp"
-#include "text.hpp"
-#include "parserHelpers.hpp"
+#include "vmime/relay.hpp"
+#include "vmime/text.hpp"
+#include "vmime/parserHelpers.hpp"
 
 #include <sstream>
 
diff --git a/src/text.cpp b/src/text.cpp
index cfbbea7a..4fb5337b 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -17,13 +17,13 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "text.hpp"
+#include "vmime/text.hpp"
 
-#include "utility/stringUtils.hpp"
+#include "vmime/utility/stringUtils.hpp"
 
-#include "encoder.hpp"
-#include "encoderB64.hpp"
-#include "encoderQP.hpp"
+#include "vmime/encoder.hpp"
+#include "vmime/encoderB64.hpp"
+#include "vmime/encoderQP.hpp"
 
 
 namespace vmime
diff --git a/src/textPartFactory.cpp b/src/textPartFactory.cpp
index c8fc37eb..0401cc8c 100644
--- a/src/textPartFactory.cpp
+++ b/src/textPartFactory.cpp
@@ -17,12 +17,12 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "textPartFactory.hpp"
-#include "exception.hpp"
+#include "vmime/textPartFactory.hpp"
+#include "vmime/exception.hpp"
 
 
-#include "plainTextPart.hpp"
-#include "htmlTextPart.hpp"
+#include "vmime/plainTextPart.hpp"
+#include "vmime/htmlTextPart.hpp"
 
 
 namespace vmime
diff --git a/src/typeAdapter.cpp b/src/typeAdapter.cpp
index 58b42a01..6585a15a 100644
--- a/src/typeAdapter.cpp
+++ b/src/typeAdapter.cpp
@@ -18,7 +18,7 @@
 //
 
 
-#include "typeAdapter.hpp"
+#include "vmime/typeAdapter.hpp"
 
 
 namespace vmime
diff --git a/src/utility/md5.cpp b/src/utility/md5.cpp
index 9a1d4129..53bf17ae 100644
--- a/src/utility/md5.cpp
+++ b/src/utility/md5.cpp
@@ -44,7 +44,7 @@
 //     These notices must be retained in any copies of any part of this
 //     documentation and/or software.
 
-#include "utility/md5.hpp"
+#include "vmime/utility/md5.hpp"
 
 
 namespace vmime {
diff --git a/src/utility/path.cpp b/src/utility/path.cpp
index 6455145d..b7651615 100644
--- a/src/utility/path.cpp
+++ b/src/utility/path.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "utility/path.hpp"
+#include "vmime/utility/path.hpp"
 
 #include <algorithm>
 
diff --git a/src/utility/random.cpp b/src/utility/random.cpp
index 43e5703c..7c82d78c 100644
--- a/src/utility/random.cpp
+++ b/src/utility/random.cpp
@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "utility/random.hpp"
-#include "platformDependant.hpp"
+#include "vmime/utility/random.hpp"
+#include "vmime/platformDependant.hpp"
 
 #include <ctime>
 
diff --git a/src/utility/singleton.cpp b/src/utility/singleton.cpp
index c960a64a..a429c41f 100644
--- a/src/utility/singleton.cpp
+++ b/src/utility/singleton.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "singleton.hpp"
+#include "vmime/utility/singleton.hpp"
 
 
 namespace vmime {
diff --git a/src/utility/stream.cpp b/src/utility/stream.cpp
index 38d12e9f..ede2332b 100644
--- a/src/utility/stream.cpp
+++ b/src/utility/stream.cpp
@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "utility/stream.hpp"
-#include "utility/stringProxy.hpp"
+#include "vmime/utility/stream.hpp"
+#include "vmime/utility/stringProxy.hpp"
 
 #include <algorithm>  // for std::copy
 #include <iterator>   // for std::back_inserter
diff --git a/src/utility/stringProxy.cpp b/src/utility/stringProxy.cpp
index 463b11b7..3569f411 100644
--- a/src/utility/stringProxy.cpp
+++ b/src/utility/stringProxy.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "utility/stringProxy.hpp"
+#include "vmime/utility/stringProxy.hpp"
 
 #include <iterator>
 #include <algorithm>
diff --git a/src/utility/stringUtils.cpp b/src/utility/stringUtils.cpp
index ab6e06c1..59e9bffd 100644
--- a/src/utility/stringUtils.cpp
+++ b/src/utility/stringUtils.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "utility/stringUtils.hpp"
+#include "vmime/utility/stringUtils.hpp"
 
 
 namespace vmime
diff --git a/src/vmime b/src/vmime
deleted file mode 100644
index 0c417f3a..00000000
--- a/src/vmime
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-// VMime library (http://vmime.sourceforge.net)
-// Copyright (C) 2002-2004 Vincent Richard <vincent@vincent-richard.net>
-//
-// 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) any later version.
-//
-// This program 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.
-//
-// You should.have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-//
-
-#ifndef VMIME_INCLUDED
-#define VMIME_INCLUDED
-
-
-// Configuration
-#include "config.hpp"
-
-// Base definitions
-#include "base.hpp"
-#include "exception.hpp"
-#include "options.hpp"
-#include "platformDependant.hpp"
-
-// Base components
-#include "dateTime.hpp"
-#include "message.hpp"
-#include "bodyPart.hpp"
-#include "charset.hpp"
-#include "text.hpp"
-#include "encoding.hpp"
-#include "contentDisposition.hpp"
-#include "mailbox.hpp"
-#include "mailboxGroup.hpp"
-#include "mailboxList.hpp"
-#include "addressList.hpp"
-#include "mediaType.hpp"
-#include "messageId.hpp"
-#include "relay.hpp"
-
-// Message components
-#include "message.hpp"
-
-// Header fields
-#include "headerFieldFactory.hpp"
-#include "mailboxField.hpp"
-#include "parameterizedHeaderField.hpp"
-#include "standardFields.hpp"
-
-// Encoders
-#include "encoderFactory.hpp"
-
-// Message builder/parser
-#include "messageBuilder.hpp"
-#include "messageParser.hpp"
-
-#include "fileAttachment.hpp"
-#include "defaultAttachment.hpp"
-
-#include "plainTextPart.hpp"
-#include "htmlTextPart.hpp"
-
-// Property set
-#include "propertySet.hpp"
-
-// Messaging features
-#if VMIME_HAVE_MESSAGING_FEATURES
-	#include "messaging/socket.hpp"
-
-	#include "messaging/service.hpp"
-	#include "messaging/store.hpp"
-	#include "messaging/transport.hpp"
-
-	#include "messaging/session.hpp"
-	#include "messaging/authenticator.hpp"
-	#include "messaging/defaultAuthenticator.hpp"
-	#include "messaging/simpleAuthenticator.hpp"
-
-	#include "messaging/folder.hpp"
-	#include "messaging/message.hpp"
-#endif // VMIME_HAVE_MESSAGING_FEATURES
-
-
-#endif // VMIME_INCLUDED
diff --git a/src/word.cpp b/src/word.cpp
index 6c213f5a..e1ed77c9 100644
--- a/src/word.cpp
+++ b/src/word.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "word.hpp"
+#include "vmime/word.hpp"
 
 
 namespace vmime
diff --git a/tests/parser/encoderTest.cpp b/tests/parser/encoderTest.cpp
index d3990928..f4902279 100644
--- a/tests/parser/encoderTest.cpp
+++ b/tests/parser/encoderTest.cpp
@@ -22,8 +22,8 @@
 #include <iostream>
 #include <ostream>
 
-#include "../../src/vmime"
-#include "../../src/platforms/posix/handler.hpp"
+#include "vmime/vmime.hpp"
+#include "vmime/platforms/posix/handler.hpp"
 
 using namespace unitpp;
 
diff --git a/tests/parser/headerTest.cpp b/tests/parser/headerTest.cpp
index ced0dbd4..e4500dc0 100644
--- a/tests/parser/headerTest.cpp
+++ b/tests/parser/headerTest.cpp
@@ -22,8 +22,8 @@
 #include <iostream>
 #include <ostream>
 
-#include "../../src/vmime"
-#include "../../src/platforms/posix/handler.hpp"
+#include "vmime/vmime.hpp"
+#include "vmime/platforms/posix/handler.hpp"
 
 using namespace unitpp;
 
diff --git a/tests/parser/mailboxTest.cpp b/tests/parser/mailboxTest.cpp
index 95547e9d..2414e485 100644
--- a/tests/parser/mailboxTest.cpp
+++ b/tests/parser/mailboxTest.cpp
@@ -22,10 +22,10 @@
 #include <iostream>
 #include <ostream>
 
-#include "../../src/vmime"
-#include "../../src/platforms/posix/handler.hpp"
+#include "vmime/vmime.hpp"
+#include "vmime/platforms/posix/handler.hpp"
 
-#include "testUtils.hpp"
+#include "tests/parser/testUtils.hpp"
 
 using namespace unitpp;
 
diff --git a/tests/parser/mediaTypeTest.cpp b/tests/parser/mediaTypeTest.cpp
index 8b1ee550..6fe86e0d 100644
--- a/tests/parser/mediaTypeTest.cpp
+++ b/tests/parser/mediaTypeTest.cpp
@@ -22,8 +22,8 @@
 #include <iostream>
 #include <ostream>
 
-#include "../../src/vmime"
-#include "../../src/platforms/posix/handler.hpp"
+#include "vmime/vmime.hpp"
+#include "vmime/platforms/posix/handler.hpp"
 
 using namespace unitpp;
 
diff --git a/tests/parser/textTest.cpp b/tests/parser/textTest.cpp
index 523b5883..1262b7ee 100644
--- a/tests/parser/textTest.cpp
+++ b/tests/parser/textTest.cpp
@@ -22,10 +22,10 @@
 #include <iostream>
 #include <ostream>
 
-#include "../../src/vmime"
-#include "../../src/platforms/posix/handler.hpp"
+#include "vmime/vmime.hpp"
+#include "vmime/platforms/posix/handler.hpp"
 
-#include "testUtils.hpp"
+#include "tests/parser/testUtils.hpp"
 
 using namespace unitpp;
 
diff --git a/src/address.hpp b/vmime/address.hpp
similarity index 97%
rename from src/address.hpp
rename to vmime/address.hpp
index 5fc00541..9bdfe199 100644
--- a/src/address.hpp
+++ b/vmime/address.hpp
@@ -21,8 +21,8 @@
 #define VMIME_ADDRESS_HPP_INCLUDED
 
 
-#include "base.hpp"
-#include "component.hpp"
+#include "vmime/base.hpp"
+#include "vmime/component.hpp"
 
 
 namespace vmime
diff --git a/src/addressList.hpp b/vmime/addressList.hpp
similarity index 98%
rename from src/addressList.hpp
rename to vmime/addressList.hpp
index 5d7ef18d..823b6b52 100644
--- a/src/addressList.hpp
+++ b/vmime/addressList.hpp
@@ -21,10 +21,10 @@
 #define VMIME_ADDRESSLIST_HPP_INCLUDED
 
 
-#include "base.hpp"
-#include "component.hpp"
+#include "vmime/base.hpp"
+#include "vmime/component.hpp"
 
-#include "address.hpp"
+#include "vmime/address.hpp"
 
 
 namespace vmime
diff --git a/src/attachment.hpp b/vmime/attachment.hpp
similarity index 91%
rename from src/attachment.hpp
rename to vmime/attachment.hpp
index 2b4ad6e9..f4478f2f 100644
--- a/src/attachment.hpp
+++ b/vmime/attachment.hpp
@@ -21,13 +21,13 @@
 #define VMIME_ATTACHMENT_HPP_INCLUDED
 
 
-#include "base.hpp"
+#include "vmime/base.hpp"
 
-#include "bodyPart.hpp"
-#include "mediaType.hpp"
-#include "text.hpp"
-#include "contentHandler.hpp"
-#include "encoding.hpp"
+#include "vmime/bodyPart.hpp"
+#include "vmime/mediaType.hpp"
+#include "vmime/text.hpp"
+#include "vmime/contentHandler.hpp"
+#include "vmime/encoding.hpp"
 
 
 namespace vmime
diff --git a/src/base.hpp b/vmime/base.hpp
similarity index 97%
rename from src/base.hpp
rename to vmime/base.hpp
index 9e06bba6..65a76618 100644
--- a/src/base.hpp
+++ b/vmime/base.hpp
@@ -27,10 +27,10 @@
 #include <sstream>
 #include <locale>
 
-#include "config.hpp"
-#include "types.hpp"
-#include "constants.hpp"
-#include "utility/stream.hpp"
+#include "vmime/config.hpp"
+#include "vmime/types.hpp"
+#include "vmime/constants.hpp"
+#include "vmime/utility/stream.hpp"
 
 
 namespace vmime
diff --git a/src/body.hpp b/vmime/body.hpp
similarity index 96%
rename from src/body.hpp
rename to vmime/body.hpp
index 9008fea9..970a852b 100644
--- a/src/body.hpp
+++ b/vmime/body.hpp
@@ -21,16 +21,16 @@
 #define VMIME_BODY_HPP_INCLUDED
 
 
-#include "base.hpp"
-#include "component.hpp"
+#include "vmime/base.hpp"
+#include "vmime/component.hpp"
 
-#include "header.hpp"
+#include "vmime/header.hpp"
 
-#include "mediaType.hpp"
-#include "charset.hpp"
-#include "encoding.hpp"
+#include "vmime/mediaType.hpp"
+#include "vmime/charset.hpp"
+#include "vmime/encoding.hpp"
 
-#include "contentHandler.hpp"
+#include "vmime/contentHandler.hpp"
 
 
 namespace vmime
diff --git a/src/bodyPart.hpp b/vmime/bodyPart.hpp
similarity index 95%
rename from src/bodyPart.hpp
rename to vmime/bodyPart.hpp
index 222b8db9..c153c58d 100644
--- a/src/bodyPart.hpp
+++ b/vmime/bodyPart.hpp
@@ -21,11 +21,11 @@
 #define VMIME_BODYPART_HPP_INCLUDED
 
 
-#include "base.hpp"
-#include "component.hpp"
+#include "vmime/base.hpp"
+#include "vmime/component.hpp"
 
-#include "header.hpp"
-#include "body.hpp"
+#include "vmime/header.hpp"
+#include "vmime/body.hpp"
 
 
 namespace vmime
diff --git a/src/charset.hpp b/vmime/charset.hpp
similarity index 98%
rename from src/charset.hpp
rename to vmime/charset.hpp
index 8de75329..0fa76881 100644
--- a/src/charset.hpp
+++ b/vmime/charset.hpp
@@ -21,8 +21,8 @@
 #define VMIME_CHARSET_HPP_INCLUDED
 
 
-#include "base.hpp"
-#include "component.hpp"
+#include "vmime/base.hpp"
+#include "vmime/component.hpp"
 
 
 namespace vmime
diff --git a/src/component.hpp b/vmime/component.hpp
similarity index 99%
rename from src/component.hpp
rename to vmime/component.hpp
index af5386b2..7669ef69 100644
--- a/src/component.hpp
+++ b/vmime/component.hpp
@@ -21,7 +21,7 @@
 #define VMIME_COMPONENT_HPP_INCLUDED
 
 
-#include "base.hpp"
+#include "vmime/base.hpp"
 
 
 namespace vmime
diff --git a/src/constants.hpp b/vmime/constants.hpp
similarity index 99%
rename from src/constants.hpp
rename to vmime/constants.hpp
index 6dc21790..dbf472b2 100644
--- a/src/constants.hpp
+++ b/vmime/constants.hpp
@@ -23,7 +23,7 @@
 
 #include <string>
 
-#include "types.hpp"
+#include "vmime/types.hpp"
 
 
 namespace vmime
diff --git a/src/contentDisposition.hpp b/vmime/contentDisposition.hpp
similarity index 97%
rename from src/contentDisposition.hpp
rename to vmime/contentDisposition.hpp
index cdc036aa..6aeb2544 100644
--- a/src/contentDisposition.hpp
+++ b/vmime/contentDisposition.hpp
@@ -21,8 +21,8 @@
 #define VMIME_CONTENTDISPOSITION_HPP_INCLUDED
 
 
-#include "base.hpp"
-#include "component.hpp"
+#include "vmime/base.hpp"
+#include "vmime/component.hpp"
 
 
 namespace vmime
diff --git a/src/contentDispositionField.hpp b/vmime/contentDispositionField.hpp
similarity index 92%
rename from src/contentDispositionField.hpp
rename to vmime/contentDispositionField.hpp
index b896ce3e..30029e7f 100644
--- a/src/contentDispositionField.hpp
+++ b/vmime/contentDispositionField.hpp
@@ -21,11 +21,11 @@
 #define VMIME_CONTENTDISPOSITIONFIELD_HPP_INCLUDED
 
 
-#include "parameterizedHeaderField.hpp"
-#include "genericField.hpp"
+#include "vmime/parameterizedHeaderField.hpp"
+#include "vmime/genericField.hpp"
 
-#include "contentDisposition.hpp"
-#include "dateTime.hpp"
+#include "vmime/contentDisposition.hpp"
+#include "vmime/dateTime.hpp"
 
 
 namespace vmime
diff --git a/src/contentHandler.hpp b/vmime/contentHandler.hpp
similarity index 96%
rename from src/contentHandler.hpp
rename to vmime/contentHandler.hpp
index a6ea884a..685130d0 100644
--- a/src/contentHandler.hpp
+++ b/vmime/contentHandler.hpp
@@ -23,10 +23,10 @@
 
 #include <limits>
 
-#include "base.hpp"
-#include "utility/stringProxy.hpp"
-#include "utility/smartPtr.hpp"
-#include "encoding.hpp"
+#include "vmime/base.hpp"
+#include "vmime/utility/stringProxy.hpp"
+#include "vmime/utility/smartPtr.hpp"
+#include "vmime/encoding.hpp"
 
 
 namespace vmime
diff --git a/src/contentTypeField.hpp b/vmime/contentTypeField.hpp
similarity index 90%
rename from src/contentTypeField.hpp
rename to vmime/contentTypeField.hpp
index 69ea5d5c..960e91c9 100644
--- a/src/contentTypeField.hpp
+++ b/vmime/contentTypeField.hpp
@@ -21,11 +21,11 @@
 #define VMIME_CONTENTTYPEFIELD_HPP_INCLUDED
 
 
-#include "parameterizedHeaderField.hpp"
-#include "genericField.hpp"
+#include "vmime/parameterizedHeaderField.hpp"
+#include "vmime/genericField.hpp"
 
-#include "mediaType.hpp"
-#include "charset.hpp"
+#include "vmime/mediaType.hpp"
+#include "vmime/charset.hpp"
 
 
 namespace vmime
diff --git a/src/dateTime.hpp b/vmime/dateTime.hpp
similarity index 98%
rename from src/dateTime.hpp
rename to vmime/dateTime.hpp
index 40ff90fc..10df78d0 100644
--- a/src/dateTime.hpp
+++ b/vmime/dateTime.hpp
@@ -21,8 +21,8 @@
 #define VMIME_DATETIME_HPP_INCLUDED
 
 
-#include "base.hpp"
-#include "component.hpp"
+#include "vmime/base.hpp"
+#include "vmime/component.hpp"
 
 
 namespace vmime
diff --git a/src/defaultAttachment.hpp b/vmime/defaultAttachment.hpp
similarity index 97%
rename from src/defaultAttachment.hpp
rename to vmime/defaultAttachment.hpp
index 0fe21092..22c29b36 100644
--- a/src/defaultAttachment.hpp
+++ b/vmime/defaultAttachment.hpp
@@ -21,8 +21,8 @@
 #define VMIME_DEFAULTATTACHMENT_HPP_INCLUDED
 
 
-#include "attachment.hpp"
-#include "encoding.hpp"
+#include "vmime/attachment.hpp"
+#include "vmime/encoding.hpp"
 
 
 namespace vmime
diff --git a/src/encoder.hpp b/vmime/encoder.hpp
similarity index 96%
rename from src/encoder.hpp
rename to vmime/encoder.hpp
index 3d2f7159..e9eb2ccd 100644
--- a/src/encoder.hpp
+++ b/vmime/encoder.hpp
@@ -21,9 +21,9 @@
 #define VMIME_ENCODER_HPP_INCLUDED
 
 
-#include "base.hpp"
-#include "propertySet.hpp"
-#include "exception.hpp"
+#include "vmime/base.hpp"
+#include "vmime/propertySet.hpp"
+#include "vmime/exception.hpp"
 
 
 namespace vmime
diff --git a/src/encoder7bit.hpp b/vmime/encoder7bit.hpp
similarity index 96%
rename from src/encoder7bit.hpp
rename to vmime/encoder7bit.hpp
index a4b64cdf..bb11e474 100644
--- a/src/encoder7bit.hpp
+++ b/vmime/encoder7bit.hpp
@@ -21,7 +21,7 @@
 #define VMIME_ENCODER7BIT_HPP_INCLUDED
 
 
-#include "encoderDefault.hpp"
+#include "vmime/encoderDefault.hpp"
 
 
 namespace vmime
diff --git a/src/encoder8bit.hpp b/vmime/encoder8bit.hpp
similarity index 96%
rename from src/encoder8bit.hpp
rename to vmime/encoder8bit.hpp
index 7cbbd417..ea4cca78 100644
--- a/src/encoder8bit.hpp
+++ b/vmime/encoder8bit.hpp
@@ -21,7 +21,7 @@
 #define VMIME_ENCODER8BIT_HPP_INCLUDED
 
 
-#include "encoderDefault.hpp"
+#include "vmime/encoderDefault.hpp"
 
 
 namespace vmime
diff --git a/src/encoderB64.hpp b/vmime/encoderB64.hpp
similarity index 98%
rename from src/encoderB64.hpp
rename to vmime/encoderB64.hpp
index 93c0b7f3..5ed3684c 100644
--- a/src/encoderB64.hpp
+++ b/vmime/encoderB64.hpp
@@ -21,7 +21,7 @@
 #define VMIME_ENCODERB64_HPP_INCLUDED
 
 
-#include "encoder.hpp"
+#include "vmime/encoder.hpp"
 
 
 namespace vmime
diff --git a/src/encoderBinary.hpp b/vmime/encoderBinary.hpp
similarity index 96%
rename from src/encoderBinary.hpp
rename to vmime/encoderBinary.hpp
index dadca217..e2f4190a 100644
--- a/src/encoderBinary.hpp
+++ b/vmime/encoderBinary.hpp
@@ -21,7 +21,7 @@
 #define VMIME_ENCODERBINARY_HPP_INCLUDED
 
 
-#include "encoderDefault.hpp"
+#include "vmime/encoderDefault.hpp"
 
 
 namespace vmime
diff --git a/src/encoderDefault.hpp b/vmime/encoderDefault.hpp
similarity index 97%
rename from src/encoderDefault.hpp
rename to vmime/encoderDefault.hpp
index d54d1f0f..9b07e4e1 100644
--- a/src/encoderDefault.hpp
+++ b/vmime/encoderDefault.hpp
@@ -21,7 +21,7 @@
 #define VMIME_ENCODERDEFAULT_HPP_INCLUDED
 
 
-#include "encoder.hpp"
+#include "vmime/encoder.hpp"
 
 
 namespace vmime
diff --git a/src/encoderFactory.hpp b/vmime/encoderFactory.hpp
similarity index 96%
rename from src/encoderFactory.hpp
rename to vmime/encoderFactory.hpp
index a5d39c6e..7efbed70 100644
--- a/src/encoderFactory.hpp
+++ b/vmime/encoderFactory.hpp
@@ -21,9 +21,9 @@
 #define VMIME_ENCODERFACTORY_HPP_INCLUDED
 
 
-#include "encoder.hpp"
-#include "utility/singleton.hpp"
-#include "utility/stringUtils.hpp"
+#include "vmime/encoder.hpp"
+#include "vmime/utility/singleton.hpp"
+#include "vmime/utility/stringUtils.hpp"
 
 
 namespace vmime
diff --git a/src/encoderQP.hpp b/vmime/encoderQP.hpp
similarity index 98%
rename from src/encoderQP.hpp
rename to vmime/encoderQP.hpp
index 2029c8b9..d1ba61a9 100644
--- a/src/encoderQP.hpp
+++ b/vmime/encoderQP.hpp
@@ -21,7 +21,7 @@
 #define VMIME_ENCODERQP_HPP_INCLUDED
 
 
-#include "encoder.hpp"
+#include "vmime/encoder.hpp"
 
 
 namespace vmime
diff --git a/src/encoderUUE.hpp b/vmime/encoderUUE.hpp
similarity index 97%
rename from src/encoderUUE.hpp
rename to vmime/encoderUUE.hpp
index 44945de9..352412ee 100644
--- a/src/encoderUUE.hpp
+++ b/vmime/encoderUUE.hpp
@@ -21,7 +21,7 @@
 #define VMIME_ENCODERUUE_HPP_INCLUDED
 
 
-#include "encoder.hpp"
+#include "vmime/encoder.hpp"
 
 
 namespace vmime
diff --git a/src/encoding.hpp b/vmime/encoding.hpp
similarity index 97%
rename from src/encoding.hpp
rename to vmime/encoding.hpp
index e8d358ac..ffee91c6 100644
--- a/src/encoding.hpp
+++ b/vmime/encoding.hpp
@@ -21,9 +21,9 @@
 #define VMIME_ENCODING_HPP_INCLUDED
 
 
-#include "base.hpp"
-#include "component.hpp"
-#include "encoder.hpp"
+#include "vmime/base.hpp"
+#include "vmime/component.hpp"
+#include "vmime/encoder.hpp"
 
 
 namespace vmime
diff --git a/src/exception.hpp b/vmime/exception.hpp
similarity index 99%
rename from src/exception.hpp
rename to vmime/exception.hpp
index d7f95b95..040df7b3 100644
--- a/src/exception.hpp
+++ b/vmime/exception.hpp
@@ -21,9 +21,9 @@
 #define VMIME_EXCEPTION_HPP_INCLUDED
 
 
-#include "config.hpp"
-#include "base.hpp"
-#include "utility/path.hpp"
+#include "vmime/config.hpp"
+#include "vmime/base.hpp"
+#include "vmime/utility/path.hpp"
 
 
 namespace vmime
diff --git a/src/fileAttachment.hpp b/vmime/fileAttachment.hpp
similarity index 99%
rename from src/fileAttachment.hpp
rename to vmime/fileAttachment.hpp
index f38b6d79..42425351 100644
--- a/src/fileAttachment.hpp
+++ b/vmime/fileAttachment.hpp
@@ -21,7 +21,7 @@
 #define VMIME_FILEATTACHMENT_HPP_INCLUDED
 
 
-#include "defaultAttachment.hpp"
+#include "vmime/defaultAttachment.hpp"
 
 
 namespace vmime
diff --git a/src/genericField.hpp b/vmime/genericField.hpp
similarity index 94%
rename from src/genericField.hpp
rename to vmime/genericField.hpp
index b212fdbc..4b484f80 100644
--- a/src/genericField.hpp
+++ b/vmime/genericField.hpp
@@ -21,10 +21,10 @@
 #define VMIME_GENERICFIELD_HPP_INCLUDED
 
 
-#include "headerField.hpp"
-#include "headerFieldFactory.hpp"
+#include "vmime/headerField.hpp"
+#include "vmime/headerFieldFactory.hpp"
 
-#include "typeAdapter.hpp"
+#include "vmime/typeAdapter.hpp"
 
 
 namespace vmime
diff --git a/src/genericParameter.hpp b/vmime/genericParameter.hpp
similarity index 94%
rename from src/genericParameter.hpp
rename to vmime/genericParameter.hpp
index fa335240..6920c3d6 100644
--- a/src/genericParameter.hpp
+++ b/vmime/genericParameter.hpp
@@ -21,10 +21,10 @@
 #define VMIME_GENERICPARAMETER_HPP_INCLUDED
 
 
-#include "parameter.hpp"
-#include "parameterFactory.hpp"
+#include "vmime/parameter.hpp"
+#include "vmime/parameterFactory.hpp"
 
-#include "typeAdapter.hpp"
+#include "vmime/typeAdapter.hpp"
 
 
 namespace vmime
diff --git a/src/header.hpp b/vmime/header.hpp
similarity index 95%
rename from src/header.hpp
rename to vmime/header.hpp
index d191e776..b3f09f27 100644
--- a/src/header.hpp
+++ b/vmime/header.hpp
@@ -21,19 +21,19 @@
 #define VMIME_HEADER_HPP_INCLUDED
 
 
-#include "base.hpp"
-#include "component.hpp"
-#include "exception.hpp"
+#include "vmime/base.hpp"
+#include "vmime/component.hpp"
+#include "vmime/exception.hpp"
 
-#include "headerField.hpp"
-#include "headerFieldFactory.hpp"
+#include "vmime/headerField.hpp"
+#include "vmime/headerFieldFactory.hpp"
 
-#include "mailboxField.hpp"
-#include "contentTypeField.hpp"
-#include "contentDispositionField.hpp"
+#include "vmime/mailboxField.hpp"
+#include "vmime/contentTypeField.hpp"
+#include "vmime/contentDispositionField.hpp"
 
-#include "standardFields.hpp"
-#include "standardParams.hpp"
+#include "vmime/standardFields.hpp"
+#include "vmime/standardParams.hpp"
 
 
 namespace vmime
diff --git a/src/headerField.hpp b/vmime/headerField.hpp
similarity index 97%
rename from src/headerField.hpp
rename to vmime/headerField.hpp
index 081c809a..42abd714 100644
--- a/src/headerField.hpp
+++ b/vmime/headerField.hpp
@@ -21,8 +21,8 @@
 #define VMIME_HEADERFIELD_HPP_INCLUDED
 
 
-#include "base.hpp"
-#include "component.hpp"
+#include "vmime/base.hpp"
+#include "vmime/component.hpp"
 
 
 namespace vmime
diff --git a/src/headerFieldFactory.hpp b/vmime/headerFieldFactory.hpp
similarity index 93%
rename from src/headerFieldFactory.hpp
rename to vmime/headerFieldFactory.hpp
index 7090546d..a3bb4d26 100644
--- a/src/headerFieldFactory.hpp
+++ b/vmime/headerFieldFactory.hpp
@@ -21,9 +21,9 @@
 #define VMIME_HEADERFIELDFACTORY_HPP_INCLUDED
 
 
-#include "headerField.hpp"
-#include "utility/singleton.hpp"
-#include "utility/stringUtils.hpp"
+#include "vmime/headerField.hpp"
+#include "vmime/utility/singleton.hpp"
+#include "vmime/utility/stringUtils.hpp"
 
 
 namespace vmime
diff --git a/src/htmlTextPart.hpp b/vmime/htmlTextPart.hpp
similarity index 97%
rename from src/htmlTextPart.hpp
rename to vmime/htmlTextPart.hpp
index cd45562c..d967765b 100644
--- a/src/htmlTextPart.hpp
+++ b/vmime/htmlTextPart.hpp
@@ -21,11 +21,11 @@
 #define VMIME_HTMLTEXTPART_HPP_INCLUDED
 
 
-#include "textPart.hpp"
-#include "messageId.hpp"
-#include "encoding.hpp"
+#include "vmime/textPart.hpp"
+#include "vmime/messageId.hpp"
+#include "vmime/encoding.hpp"
 
-#include "contentHandler.hpp"
+#include "vmime/contentHandler.hpp"
 
 
 namespace vmime
diff --git a/src/mailbox.hpp b/vmime/mailbox.hpp
similarity index 97%
rename from src/mailbox.hpp
rename to vmime/mailbox.hpp
index 0acc2cc8..234607df 100644
--- a/src/mailbox.hpp
+++ b/vmime/mailbox.hpp
@@ -21,8 +21,8 @@
 #define VMIME_MAILBOX_HPP_INCLUDED
 
 
-#include "address.hpp"
-#include "text.hpp"
+#include "vmime/address.hpp"
+#include "vmime/text.hpp"
 
 
 namespace vmime
diff --git a/src/mailboxField.hpp b/vmime/mailboxField.hpp
similarity index 95%
rename from src/mailboxField.hpp
rename to vmime/mailboxField.hpp
index a8213613..ae9fa88d 100644
--- a/src/mailboxField.hpp
+++ b/vmime/mailboxField.hpp
@@ -21,8 +21,8 @@
 #define VMIME_MAILBOXFIELD_HPP_INCLUDED
 
 
-#include "genericField.hpp"
-#include "mailbox.hpp"
+#include "vmime/genericField.hpp"
+#include "vmime/mailbox.hpp"
 
 
 namespace vmime
diff --git a/src/mailboxGroup.hpp b/vmime/mailboxGroup.hpp
similarity index 98%
rename from src/mailboxGroup.hpp
rename to vmime/mailboxGroup.hpp
index d0d7fd93..320509ab 100644
--- a/src/mailboxGroup.hpp
+++ b/vmime/mailboxGroup.hpp
@@ -21,9 +21,9 @@
 #define VMIME_MAILBOXGROUP_HPP_INCLUDED
 
 
-#include "address.hpp"
-#include "mailbox.hpp"
-#include "text.hpp"
+#include "vmime/address.hpp"
+#include "vmime/mailbox.hpp"
+#include "vmime/text.hpp"
 
 
 namespace vmime
diff --git a/src/mailboxList.hpp b/vmime/mailboxList.hpp
similarity index 98%
rename from src/mailboxList.hpp
rename to vmime/mailboxList.hpp
index 3cd5f038..5c576d0d 100644
--- a/src/mailboxList.hpp
+++ b/vmime/mailboxList.hpp
@@ -21,8 +21,8 @@
 #define VMIME_MAILBOXLIST_HPP_INCLUDED
 
 
-#include "addressList.hpp"
-#include "mailbox.hpp"
+#include "vmime/addressList.hpp"
+#include "vmime/mailbox.hpp"
 
 
 namespace vmime
diff --git a/src/mediaType.hpp b/vmime/mediaType.hpp
similarity index 97%
rename from src/mediaType.hpp
rename to vmime/mediaType.hpp
index 7f88c965..8f20c473 100644
--- a/src/mediaType.hpp
+++ b/vmime/mediaType.hpp
@@ -21,8 +21,8 @@
 #define VMIME_MEDIATYPE_HPP_INCLUDED
 
 
-#include "base.hpp"
-#include "component.hpp"
+#include "vmime/base.hpp"
+#include "vmime/component.hpp"
 
 
 namespace vmime
diff --git a/src/message.hpp b/vmime/message.hpp
similarity index 96%
rename from src/message.hpp
rename to vmime/message.hpp
index 9b3c6cc9..954dfb74 100644
--- a/src/message.hpp
+++ b/vmime/message.hpp
@@ -21,8 +21,8 @@
 #define VMIME_MESSAGE_HPP_INCLUDED
 
 
-#include "bodyPart.hpp"
-#include "options.hpp"
+#include "vmime/bodyPart.hpp"
+#include "vmime/options.hpp"
 
 
 namespace vmime
diff --git a/src/messageBuilder.hpp b/vmime/messageBuilder.hpp
similarity index 94%
rename from src/messageBuilder.hpp
rename to vmime/messageBuilder.hpp
index 15bd8bc0..9071404c 100644
--- a/src/messageBuilder.hpp
+++ b/vmime/messageBuilder.hpp
@@ -21,16 +21,16 @@
 #define VMIME_MESSAGEBUILDER_HPP_INCLUDED
 
 
-#include "base.hpp"
+#include "vmime/base.hpp"
 
-#include "mailbox.hpp"
-#include "addressList.hpp"
-#include "text.hpp"
-#include "message.hpp"
-#include "mediaType.hpp"
-#include "attachment.hpp"
-#include "textPart.hpp"
-#include "bodyPart.hpp"
+#include "vmime/mailbox.hpp"
+#include "vmime/addressList.hpp"
+#include "vmime/text.hpp"
+#include "vmime/message.hpp"
+#include "vmime/mediaType.hpp"
+#include "vmime/attachment.hpp"
+#include "vmime/textPart.hpp"
+#include "vmime/bodyPart.hpp"
 
 
 namespace vmime
diff --git a/src/messageId.hpp b/vmime/messageId.hpp
similarity index 98%
rename from src/messageId.hpp
rename to vmime/messageId.hpp
index 467b554b..bbf8dd2b 100644
--- a/src/messageId.hpp
+++ b/vmime/messageId.hpp
@@ -21,8 +21,8 @@
 #define VMIME_MESSAGEID_HPP_INCLUDED
 
 
-#include "base.hpp"
-#include "component.hpp"
+#include "vmime/base.hpp"
+#include "vmime/component.hpp"
 
 
 namespace vmime
diff --git a/src/messageParser.hpp b/vmime/messageParser.hpp
similarity index 96%
rename from src/messageParser.hpp
rename to vmime/messageParser.hpp
index f6853e9f..ec8d0a52 100644
--- a/src/messageParser.hpp
+++ b/vmime/messageParser.hpp
@@ -21,12 +21,12 @@
 #define VMIME_MESSAGEPARSER_HPP_INCLUDED
 
 
-#include "base.hpp"
+#include "vmime/base.hpp"
 
-#include "message.hpp"
-#include "attachment.hpp"
+#include "vmime/message.hpp"
+#include "vmime/attachment.hpp"
 
-#include "textPart.hpp"
+#include "vmime/textPart.hpp"
 
 
 namespace vmime
diff --git a/src/messaging/IMAPConnection.hpp b/vmime/messaging/IMAPConnection.hpp
similarity index 91%
rename from src/messaging/IMAPConnection.hpp
rename to vmime/messaging/IMAPConnection.hpp
index e53978c0..3fc9c9d6 100644
--- a/src/messaging/IMAPConnection.hpp
+++ b/vmime/messaging/IMAPConnection.hpp
@@ -21,13 +21,13 @@
 #define VMIME_MESSAGING_IMAPCONNECTION_HPP_INCLUDED
 
 
-#include "config.hpp"
+#include "vmime/config.hpp"
 
-#include "messaging/authenticator.hpp"
-#include "messaging/socket.hpp"
-#include "messaging/timeoutHandler.hpp"
+#include "vmime/messaging/authenticator.hpp"
+#include "vmime/messaging/socket.hpp"
+#include "vmime/messaging/timeoutHandler.hpp"
 
-#include "messaging/IMAPParser.hpp"
+#include "vmime/messaging/IMAPParser.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/IMAPFolder.hpp b/vmime/messaging/IMAPFolder.hpp
similarity index 98%
rename from src/messaging/IMAPFolder.hpp
rename to vmime/messaging/IMAPFolder.hpp
index 7a8382d1..17929b8d 100644
--- a/src/messaging/IMAPFolder.hpp
+++ b/vmime/messaging/IMAPFolder.hpp
@@ -24,9 +24,9 @@
 #include <vector>
 #include <map>
 
-#include "types.hpp"
+#include "vmime/types.hpp"
 
-#include "messaging/folder.hpp"
+#include "vmime/messaging/folder.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/IMAPMessage.hpp b/vmime/messaging/IMAPMessage.hpp
similarity index 95%
rename from src/messaging/IMAPMessage.hpp
rename to vmime/messaging/IMAPMessage.hpp
index ad844784..45d785c4 100644
--- a/src/messaging/IMAPMessage.hpp
+++ b/vmime/messaging/IMAPMessage.hpp
@@ -21,10 +21,10 @@
 #define VMIME_MESSAGING_IMAPMESSAGE_HPP_INCLUDED
 
 
-#include "messaging/message.hpp"
-#include "messaging/folder.hpp"
+#include "vmime/messaging/message.hpp"
+#include "vmime/messaging/folder.hpp"
 
-#include "mailboxList.hpp"
+#include "vmime/mailboxList.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/IMAPParser.hpp b/vmime/messaging/IMAPParser.hpp
similarity index 99%
rename from src/messaging/IMAPParser.hpp
rename to vmime/messaging/IMAPParser.hpp
index bd4eeb56..585f086d 100644
--- a/src/messaging/IMAPParser.hpp
+++ b/vmime/messaging/IMAPParser.hpp
@@ -21,24 +21,24 @@
 #define VMIME_MESSAGING_IMAPPARSER_HPP_INCLUDED
 
 
-#include "base.hpp"
-#include "dateTime.hpp"
-#include "charset.hpp"
-#include "exception.hpp"
+#include "vmime/base.hpp"
+#include "vmime/dateTime.hpp"
+#include "vmime/charset.hpp"
+#include "vmime/exception.hpp"
 
-#include "utility/smartPtr.hpp"
-#include "utility/stringUtils.hpp"
+#include "vmime/utility/smartPtr.hpp"
+#include "vmime/utility/stringUtils.hpp"
 
-#include "encoderB64.hpp"
-#include "encoderQP.hpp"
+#include "vmime/encoderB64.hpp"
+#include "vmime/encoderQP.hpp"
 
-#include "platformDependant.hpp"
+#include "vmime/platformDependant.hpp"
 
-#include "messaging/progressionListener.hpp"
-#include "messaging/timeoutHandler.hpp"
-#include "messaging/socket.hpp"
+#include "vmime/messaging/progressionListener.hpp"
+#include "vmime/messaging/timeoutHandler.hpp"
+#include "vmime/messaging/socket.hpp"
 
-#include "messaging/IMAPTag.hpp"
+#include "vmime/messaging/IMAPTag.hpp"
 
 #include <vector>
 #include <stdexcept>
diff --git a/src/messaging/IMAPStore.hpp b/vmime/messaging/IMAPStore.hpp
similarity index 94%
rename from src/messaging/IMAPStore.hpp
rename to vmime/messaging/IMAPStore.hpp
index 70f049b5..edbfdcdb 100644
--- a/src/messaging/IMAPStore.hpp
+++ b/vmime/messaging/IMAPStore.hpp
@@ -21,11 +21,11 @@
 #define VMIME_MESSAGING_IMAPSTORE_HPP_INCLUDED
 
 
-#include "config.hpp"
+#include "vmime/config.hpp"
 
-#include "messaging/store.hpp"
-#include "messaging/socket.hpp"
-#include "messaging/folder.hpp"
+#include "vmime/messaging/store.hpp"
+#include "vmime/messaging/socket.hpp"
+#include "vmime/messaging/folder.hpp"
 
 #include <ostream>
 
diff --git a/src/messaging/IMAPTag.hpp b/vmime/messaging/IMAPTag.hpp
similarity index 98%
rename from src/messaging/IMAPTag.hpp
rename to vmime/messaging/IMAPTag.hpp
index c7c48f31..f779d10c 100644
--- a/src/messaging/IMAPTag.hpp
+++ b/vmime/messaging/IMAPTag.hpp
@@ -21,7 +21,7 @@
 #define VMIME_MESSAGING_IMAPTAG_HPP_INCLUDED
 
 
-#include "types.hpp"
+#include "vmime/types.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/IMAPUtils.hpp b/vmime/messaging/IMAPUtils.hpp
similarity index 93%
rename from src/messaging/IMAPUtils.hpp
rename to vmime/messaging/IMAPUtils.hpp
index 767cbc34..d9d3164d 100644
--- a/src/messaging/IMAPUtils.hpp
+++ b/vmime/messaging/IMAPUtils.hpp
@@ -21,11 +21,11 @@
 #define VMIME_MESSAGING_IMAPUTILS_HPP_INCLUDED
 
 
-#include "types.hpp"
-#include "dateTime.hpp"
+#include "vmime/types.hpp"
+#include "vmime/dateTime.hpp"
 
-#include "messaging/folder.hpp"
-#include "messaging/IMAPParser.hpp"
+#include "vmime/messaging/folder.hpp"
+#include "vmime/messaging/IMAPParser.hpp"
 
 #include <vector>
 
diff --git a/src/messaging/POP3Folder.hpp b/vmime/messaging/POP3Folder.hpp
similarity index 97%
rename from src/messaging/POP3Folder.hpp
rename to vmime/messaging/POP3Folder.hpp
index 93174a8a..7ac011b3 100644
--- a/src/messaging/POP3Folder.hpp
+++ b/vmime/messaging/POP3Folder.hpp
@@ -24,10 +24,10 @@
 #include <vector>
 #include <map>
 
-#include "config.hpp"
-#include "types.hpp"
+#include "vmime/config.hpp"
+#include "vmime/types.hpp"
 
-#include "messaging/folder.hpp"
+#include "vmime/messaging/folder.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/POP3Message.hpp b/vmime/messaging/POP3Message.hpp
similarity index 95%
rename from src/messaging/POP3Message.hpp
rename to vmime/messaging/POP3Message.hpp
index 15f3562c..0908968e 100644
--- a/src/messaging/POP3Message.hpp
+++ b/vmime/messaging/POP3Message.hpp
@@ -21,10 +21,10 @@
 #define VMIME_MESSAGING_POP3MESSAGE_HPP_INCLUDED
 
 
-#include "config.hpp"
+#include "vmime/config.hpp"
 
-#include "messaging/message.hpp"
-#include "messaging/folder.hpp"
+#include "vmime/messaging/message.hpp"
+#include "vmime/messaging/folder.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/POP3Store.hpp b/vmime/messaging/POP3Store.hpp
similarity index 93%
rename from src/messaging/POP3Store.hpp
rename to vmime/messaging/POP3Store.hpp
index 3030807d..8cc76e24 100644
--- a/src/messaging/POP3Store.hpp
+++ b/vmime/messaging/POP3Store.hpp
@@ -21,13 +21,13 @@
 #define VMIME_MESSAGING_POP3STORE_HPP_INCLUDED
 
 
-#include "config.hpp"
+#include "vmime/config.hpp"
 
-#include "messaging/store.hpp"
-#include "messaging/socket.hpp"
-#include "messaging/timeoutHandler.hpp"
+#include "vmime/messaging/store.hpp"
+#include "vmime/messaging/socket.hpp"
+#include "vmime/messaging/timeoutHandler.hpp"
 
-#include "utility/stream.hpp"
+#include "vmime/utility/stream.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/SMTPTransport.hpp b/vmime/messaging/SMTPTransport.hpp
similarity index 93%
rename from src/messaging/SMTPTransport.hpp
rename to vmime/messaging/SMTPTransport.hpp
index 84f680b9..8a2a7a5a 100644
--- a/src/messaging/SMTPTransport.hpp
+++ b/vmime/messaging/SMTPTransport.hpp
@@ -21,11 +21,11 @@
 #define VMIME_MESSAGING_SMTPTRANSPORT_HPP_INCLUDED
 
 
-#include "config.hpp"
+#include "vmime/config.hpp"
 
-#include "messaging/transport.hpp"
-#include "messaging/socket.hpp"
-#include "messaging/timeoutHandler.hpp"
+#include "vmime/messaging/transport.hpp"
+#include "vmime/messaging/socket.hpp"
+#include "vmime/messaging/timeoutHandler.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/authHelper.hpp b/vmime/messaging/authHelper.hpp
similarity index 97%
rename from src/messaging/authHelper.hpp
rename to vmime/messaging/authHelper.hpp
index 147bc2bd..063b535c 100644
--- a/src/messaging/authHelper.hpp
+++ b/vmime/messaging/authHelper.hpp
@@ -21,7 +21,7 @@
 #define VMIME_MESSAGING_AUTHHELPER_HPP_INCLUDED
 
 
-#include "types.hpp"
+#include "vmime/types.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/authenticationInfos.hpp b/vmime/messaging/authenticationInfos.hpp
similarity index 98%
rename from src/messaging/authenticationInfos.hpp
rename to vmime/messaging/authenticationInfos.hpp
index 5cbf2fe9..264ae12a 100644
--- a/src/messaging/authenticationInfos.hpp
+++ b/vmime/messaging/authenticationInfos.hpp
@@ -21,7 +21,7 @@
 #define VMIME_MESSAGING_AUTHENTICATIONINFOS_HPP_INCLUDED
 
 
-#include "types.hpp"
+#include "vmime/types.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/authenticator.hpp b/vmime/messaging/authenticator.hpp
similarity index 96%
rename from src/messaging/authenticator.hpp
rename to vmime/messaging/authenticator.hpp
index 1164dbbc..7ddab926 100644
--- a/src/messaging/authenticator.hpp
+++ b/vmime/messaging/authenticator.hpp
@@ -21,7 +21,7 @@
 #define VMIME_MESSAGING_AUTHENTICATOR_HPP_INCLUDED
 
 
-#include "messaging/authenticationInfos.hpp"
+#include "vmime/messaging/authenticationInfos.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/defaultAuthenticator.hpp b/vmime/messaging/defaultAuthenticator.hpp
similarity index 95%
rename from src/messaging/defaultAuthenticator.hpp
rename to vmime/messaging/defaultAuthenticator.hpp
index b38e7bd6..b3149160 100644
--- a/src/messaging/defaultAuthenticator.hpp
+++ b/vmime/messaging/defaultAuthenticator.hpp
@@ -21,8 +21,8 @@
 #define VMIME_MESSAGING_DEFAULTAUTHENTICATOR_HPP_INCLUDED
 
 
-#include "messaging/authenticator.hpp"
-#include "propertySet.hpp"
+#include "vmime/messaging/authenticator.hpp"
+#include "vmime/propertySet.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/events.hpp b/vmime/messaging/events.hpp
similarity index 99%
rename from src/messaging/events.hpp
rename to vmime/messaging/events.hpp
index f1a166de..f98f5275 100644
--- a/src/messaging/events.hpp
+++ b/vmime/messaging/events.hpp
@@ -23,7 +23,7 @@
 
 #include <vector>
 
-#include "utility/path.hpp"
+#include "vmime/utility/path.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/folder.hpp b/vmime/messaging/folder.hpp
similarity index 97%
rename from src/messaging/folder.hpp
rename to vmime/messaging/folder.hpp
index 60bb0d23..07822189 100644
--- a/src/messaging/folder.hpp
+++ b/vmime/messaging/folder.hpp
@@ -23,13 +23,13 @@
 
 #include <vector>
 
-#include "types.hpp"
-#include "dateTime.hpp"
-#include "messaging/progressionListener.hpp"
-#include "messaging/message.hpp"
-#include "messaging/events.hpp"
-#include "utility/path.hpp"
-#include "utility/stream.hpp"
+#include "vmime/types.hpp"
+#include "vmime/dateTime.hpp"
+#include "vmime/messaging/progressionListener.hpp"
+#include "vmime/messaging/message.hpp"
+#include "vmime/messaging/events.hpp"
+#include "vmime/utility/path.hpp"
+#include "vmime/utility/stream.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/maildirFolder.hpp b/vmime/messaging/maildirFolder.hpp
similarity index 97%
rename from src/messaging/maildirFolder.hpp
rename to vmime/messaging/maildirFolder.hpp
index 2a607773..6a056c9d 100644
--- a/src/messaging/maildirFolder.hpp
+++ b/vmime/messaging/maildirFolder.hpp
@@ -24,11 +24,11 @@
 #include <vector>
 #include <map>
 
-#include "types.hpp"
+#include "vmime/types.hpp"
 
-#include "messaging/folder.hpp"
+#include "vmime/messaging/folder.hpp"
 
-#include "utility/file.hpp"
+#include "vmime/utility/file.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/maildirMessage.hpp b/vmime/messaging/maildirMessage.hpp
similarity index 96%
rename from src/messaging/maildirMessage.hpp
rename to vmime/messaging/maildirMessage.hpp
index 02ada2f6..c1503b06 100644
--- a/src/messaging/maildirMessage.hpp
+++ b/vmime/messaging/maildirMessage.hpp
@@ -21,8 +21,8 @@
 #define VMIME_MESSAGING_MAILDIRMESSAGE_HPP_INCLUDED
 
 
-#include "messaging/message.hpp"
-#include "messaging/folder.hpp"
+#include "vmime/messaging/message.hpp"
+#include "vmime/messaging/folder.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/maildirStore.hpp b/vmime/messaging/maildirStore.hpp
similarity index 92%
rename from src/messaging/maildirStore.hpp
rename to vmime/messaging/maildirStore.hpp
index b24eae60..f7de5a20 100644
--- a/src/messaging/maildirStore.hpp
+++ b/vmime/messaging/maildirStore.hpp
@@ -21,13 +21,13 @@
 #define VMIME_MESSAGING_MAILDIRSTORE_HPP_INCLUDED
 
 
-#include "config.hpp"
+#include "vmime/config.hpp"
 
-#include "messaging/store.hpp"
-#include "messaging/socket.hpp"
-#include "messaging/folder.hpp"
+#include "vmime/messaging/store.hpp"
+#include "vmime/messaging/socket.hpp"
+#include "vmime/messaging/folder.hpp"
 
-#include "utility/file.hpp"
+#include "vmime/utility/file.hpp"
 
 #include <ostream>
 
diff --git a/src/messaging/maildirUtils.hpp b/vmime/messaging/maildirUtils.hpp
similarity index 98%
rename from src/messaging/maildirUtils.hpp
rename to vmime/messaging/maildirUtils.hpp
index ca0b9bfd..a6aab690 100644
--- a/src/messaging/maildirUtils.hpp
+++ b/vmime/messaging/maildirUtils.hpp
@@ -21,8 +21,8 @@
 #define VMIME_MESSAGING_MAILDIRUTILS_HPP_INCLUDED
 
 
-#include "utility/file.hpp"
-#include "utility/path.hpp"
+#include "vmime/utility/file.hpp"
+#include "vmime/utility/path.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/message.hpp b/vmime/messaging/message.hpp
similarity index 98%
rename from src/messaging/message.hpp
rename to vmime/messaging/message.hpp
index e94663b4..bb852425 100644
--- a/src/messaging/message.hpp
+++ b/vmime/messaging/message.hpp
@@ -21,9 +21,9 @@
 #define VMIME_MESSAGING_MESSAGE_HPP_INCLUDED
 
 
-#include "header.hpp"
-#include "messaging/progressionListener.hpp"
-#include "utility/stream.hpp"
+#include "vmime/header.hpp"
+#include "vmime/messaging/progressionListener.hpp"
+#include "vmime/utility/stream.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/progressionListener.hpp b/vmime/messaging/progressionListener.hpp
similarity index 100%
rename from src/messaging/progressionListener.hpp
rename to vmime/messaging/progressionListener.hpp
diff --git a/src/messaging/service.hpp b/vmime/messaging/service.hpp
similarity index 92%
rename from src/messaging/service.hpp
rename to vmime/messaging/service.hpp
index 062d9b69..76c603e6 100644
--- a/src/messaging/service.hpp
+++ b/vmime/messaging/service.hpp
@@ -21,15 +21,15 @@
 #define VMIME_MESSAGING_SERVICE_HPP_INCLUDED
 
 
-#include "types.hpp"
+#include "vmime/types.hpp"
 
-#include "messaging/session.hpp"
+#include "vmime/messaging/session.hpp"
 
-#include "messaging/authenticator.hpp"
-#include "messaging/progressionListener.hpp"
+#include "vmime/messaging/authenticator.hpp"
+#include "vmime/messaging/progressionListener.hpp"
 
-#include "messaging/serviceFactory.hpp"
-#include "messaging/serviceInfos.hpp"
+#include "vmime/messaging/serviceFactory.hpp"
+#include "vmime/messaging/serviceInfos.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/serviceFactory.hpp b/vmime/messaging/serviceFactory.hpp
similarity index 92%
rename from src/messaging/serviceFactory.hpp
rename to vmime/messaging/serviceFactory.hpp
index 89ce9773..c1271bb9 100644
--- a/src/messaging/serviceFactory.hpp
+++ b/vmime/messaging/serviceFactory.hpp
@@ -23,16 +23,16 @@
 
 #include <map>
 
-#include "types.hpp"
-#include "base.hpp"
-#include "utility/singleton.hpp"
-#include "utility/stringUtils.hpp"
+#include "vmime/types.hpp"
+#include "vmime/base.hpp"
+#include "vmime/utility/singleton.hpp"
+#include "vmime/utility/stringUtils.hpp"
 
-#include "messaging/serviceInfos.hpp"
-#include "messaging/authenticator.hpp"
-#include "messaging/progressionListener.hpp"
-#include "messaging/timeoutHandler.hpp"
-#include "messaging/url.hpp"
+#include "vmime/messaging/serviceInfos.hpp"
+#include "vmime/messaging/authenticator.hpp"
+#include "vmime/messaging/progressionListener.hpp"
+#include "vmime/messaging/timeoutHandler.hpp"
+#include "vmime/messaging/url.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/serviceInfos.hpp b/vmime/messaging/serviceInfos.hpp
similarity index 98%
rename from src/messaging/serviceInfos.hpp
rename to vmime/messaging/serviceInfos.hpp
index a2f4a7cc..8650b991 100644
--- a/src/messaging/serviceInfos.hpp
+++ b/vmime/messaging/serviceInfos.hpp
@@ -23,7 +23,7 @@
 
 #include <vector>
 
-#include "types.hpp"
+#include "vmime/types.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/session.hpp b/vmime/messaging/session.hpp
similarity index 96%
rename from src/messaging/session.hpp
rename to vmime/messaging/session.hpp
index 4ee25157..e3d5860d 100644
--- a/src/messaging/session.hpp
+++ b/vmime/messaging/session.hpp
@@ -21,11 +21,11 @@
 #define VMIME_MESSAGING_SESSION_HPP_INCLUDED
 
 
-#include "messaging/authenticator.hpp"
-#include "messaging/progressionListener.hpp"
-#include "messaging/url.hpp"
+#include "vmime/messaging/authenticator.hpp"
+#include "vmime/messaging/progressionListener.hpp"
+#include "vmime/messaging/url.hpp"
 
-#include "propertySet.hpp"
+#include "vmime/propertySet.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/simpleAuthenticator.hpp b/vmime/messaging/simpleAuthenticator.hpp
similarity index 97%
rename from src/messaging/simpleAuthenticator.hpp
rename to vmime/messaging/simpleAuthenticator.hpp
index ddee3360..73425e59 100644
--- a/src/messaging/simpleAuthenticator.hpp
+++ b/vmime/messaging/simpleAuthenticator.hpp
@@ -21,7 +21,7 @@
 #define VMIME_MESSAGING_SIMPLEAUTHENTICATOR_HPP_INCLUDED
 
 
-#include "messaging/authenticator.hpp"
+#include "vmime/messaging/authenticator.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/socket.hpp b/vmime/messaging/socket.hpp
similarity index 99%
rename from src/messaging/socket.hpp
rename to vmime/messaging/socket.hpp
index 020af57e..7073d28e 100644
--- a/src/messaging/socket.hpp
+++ b/vmime/messaging/socket.hpp
@@ -21,7 +21,7 @@
 #define VMIME_MESSAGING_SOCKET_HPP_INCLUDED
 
 
-#include "base.hpp"
+#include "vmime/base.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/store.hpp b/vmime/messaging/store.hpp
similarity index 97%
rename from src/messaging/store.hpp
rename to vmime/messaging/store.hpp
index d6830166..f6345729 100644
--- a/src/messaging/store.hpp
+++ b/vmime/messaging/store.hpp
@@ -21,8 +21,8 @@
 #define VMIME_MESSAGING_STORE_HPP_INCLUDED
 
 
-#include "messaging/service.hpp"
-#include "messaging/folder.hpp"
+#include "vmime/messaging/service.hpp"
+#include "vmime/messaging/folder.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/timeoutHandler.hpp b/vmime/messaging/timeoutHandler.hpp
similarity index 100%
rename from src/messaging/timeoutHandler.hpp
rename to vmime/messaging/timeoutHandler.hpp
diff --git a/src/messaging/transport.hpp b/vmime/messaging/transport.hpp
similarity index 96%
rename from src/messaging/transport.hpp
rename to vmime/messaging/transport.hpp
index be7caab9..57775539 100644
--- a/src/messaging/transport.hpp
+++ b/vmime/messaging/transport.hpp
@@ -21,8 +21,8 @@
 #define VMIME_MESSAGING_TRANSPORT_HPP_INCLUDED
 
 
-#include "messaging/service.hpp"
-#include "utility/stream.hpp"
+#include "vmime/messaging/service.hpp"
+#include "vmime/utility/stream.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/url.hpp b/vmime/messaging/url.hpp
similarity index 98%
rename from src/messaging/url.hpp
rename to vmime/messaging/url.hpp
index 9440e61d..5ce52e11 100644
--- a/src/messaging/url.hpp
+++ b/vmime/messaging/url.hpp
@@ -21,8 +21,8 @@
 #define VMIME_MESSAGING_URL_HPP_INCLUDED
 
 
-#include "types.hpp"
-#include "base.hpp"
+#include "vmime/types.hpp"
+#include "vmime/base.hpp"
 
 
 namespace vmime {
diff --git a/src/messaging/urlUtils.hpp b/vmime/messaging/urlUtils.hpp
similarity index 96%
rename from src/messaging/urlUtils.hpp
rename to vmime/messaging/urlUtils.hpp
index 1e73a38a..758fbdbd 100644
--- a/src/messaging/urlUtils.hpp
+++ b/vmime/messaging/urlUtils.hpp
@@ -21,8 +21,8 @@
 #define VMIME_MESSAGING_URLUTILS_HPP_INCLUDED
 
 
-#include "types.hpp"
-#include "base.hpp"
+#include "vmime/types.hpp"
+#include "vmime/base.hpp"
 
 
 namespace vmime {
diff --git a/src/options.hpp b/vmime/options.hpp
similarity index 96%
rename from src/options.hpp
rename to vmime/options.hpp
index a3b9c051..3a0e0723 100644
--- a/src/options.hpp
+++ b/vmime/options.hpp
@@ -21,8 +21,8 @@
 #define VMIME_OPTIONS_HPP_INCLUDED
 
 
-#include "base.hpp"
-#include "utility/singleton.hpp"
+#include "vmime/base.hpp"
+#include "vmime/utility/singleton.hpp"
 
 
 namespace vmime
diff --git a/src/parameter.hpp b/vmime/parameter.hpp
similarity index 97%
rename from src/parameter.hpp
rename to vmime/parameter.hpp
index 8e718a26..4f36b2f9 100644
--- a/src/parameter.hpp
+++ b/vmime/parameter.hpp
@@ -21,8 +21,8 @@
 #define VMIME_PARAMETER_HPP_INCLUDED
 
 
-#include "base.hpp"
-#include "component.hpp"
+#include "vmime/base.hpp"
+#include "vmime/component.hpp"
 
 
 namespace vmime
diff --git a/src/parameterFactory.hpp b/vmime/parameterFactory.hpp
similarity index 94%
rename from src/parameterFactory.hpp
rename to vmime/parameterFactory.hpp
index 9cda9128..040426ad 100644
--- a/src/parameterFactory.hpp
+++ b/vmime/parameterFactory.hpp
@@ -21,9 +21,9 @@
 #define VMIME_PARAMETERFACTORY_HPP_INCLUDED
 
 
-#include "parameter.hpp"
-#include "utility/singleton.hpp"
-#include "utility/stringUtils.hpp"
+#include "vmime/parameter.hpp"
+#include "vmime/utility/singleton.hpp"
+#include "vmime/utility/stringUtils.hpp"
 
 
 namespace vmime
diff --git a/src/parameterizedHeaderField.hpp b/vmime/parameterizedHeaderField.hpp
similarity index 96%
rename from src/parameterizedHeaderField.hpp
rename to vmime/parameterizedHeaderField.hpp
index 980c78eb..e2cf2165 100644
--- a/src/parameterizedHeaderField.hpp
+++ b/vmime/parameterizedHeaderField.hpp
@@ -21,11 +21,11 @@
 #define VMIME_PARAMETERIZEDHEADERFIELD_HPP_INCLUDED
 
 
-#include "base.hpp"
-#include "headerFieldFactory.hpp"
-#include "parameter.hpp"
-#include "exception.hpp"
-#include "parameterFactory.hpp"
+#include "vmime/base.hpp"
+#include "vmime/headerFieldFactory.hpp"
+#include "vmime/parameter.hpp"
+#include "vmime/exception.hpp"
+#include "vmime/parameterFactory.hpp"
 
 
 namespace vmime
diff --git a/src/parserHelpers.hpp b/vmime/parserHelpers.hpp
similarity index 96%
rename from src/parserHelpers.hpp
rename to vmime/parserHelpers.hpp
index cfe853dd..f1735d31 100644
--- a/src/parserHelpers.hpp
+++ b/vmime/parserHelpers.hpp
@@ -21,8 +21,8 @@
 #define VMIME_PARSERHELPERS_HPP_INCLUDED
 
 
-#include "types.hpp"
-#include "utility/stringUtils.hpp"
+#include "vmime/types.hpp"
+#include "vmime/utility/stringUtils.hpp"
 
 #include <algorithm>
 
diff --git a/src/plainTextPart.hpp b/vmime/plainTextPart.hpp
similarity index 98%
rename from src/plainTextPart.hpp
rename to vmime/plainTextPart.hpp
index ae5425c6..d64e6829 100644
--- a/src/plainTextPart.hpp
+++ b/vmime/plainTextPart.hpp
@@ -21,7 +21,7 @@
 #define VMIME_PLAINTEXTPART_HPP_INCLUDED
 
 
-#include "textPart.hpp"
+#include "vmime/textPart.hpp"
 
 
 namespace vmime
diff --git a/src/platformDependant.hpp b/vmime/platformDependant.hpp
similarity index 94%
rename from src/platformDependant.hpp
rename to vmime/platformDependant.hpp
index 660d54b3..ac68cd91 100644
--- a/src/platformDependant.hpp
+++ b/vmime/platformDependant.hpp
@@ -21,18 +21,18 @@
 #define VMIME_PLATFORMDEPENDANT_HPP_INCLUDED
 
 
-#include "config.hpp"
-#include "dateTime.hpp"
-#include "exception.hpp"
-#include "charset.hpp"
+#include "vmime/config.hpp"
+#include "vmime/dateTime.hpp"
+#include "vmime/exception.hpp"
+#include "vmime/charset.hpp"
 
 #if VMIME_HAVE_MESSAGING_FEATURES
-	#include "messaging/socket.hpp"
-	#include "messaging/timeoutHandler.hpp"
+	#include "vmime/messaging/socket.hpp"
+	#include "vmime/messaging/timeoutHandler.hpp"
 #endif
 
 #if VMIME_HAVE_FILESYSTEM_FEATURES
-	#include "utility/file.hpp"
+	#include "vmime/utility/file.hpp"
 #endif
 
 
diff --git a/src/platforms/posix/file.hpp b/vmime/platforms/posix/file.hpp
similarity index 99%
rename from src/platforms/posix/file.hpp
rename to vmime/platforms/posix/file.hpp
index 7405d238..98376118 100644
--- a/src/platforms/posix/file.hpp
+++ b/vmime/platforms/posix/file.hpp
@@ -21,7 +21,7 @@
 #define VMIME_PLATFORMS_POSIX_FILE_HPP_INCLUDED
 
 
-#include "utility/file.hpp"
+#include "vmime/utility/file.hpp"
 
 
 #if VMIME_HAVE_FILESYSTEM_FEATURES
diff --git a/src/platforms/posix/handler.hpp b/vmime/platforms/posix/handler.hpp
similarity index 92%
rename from src/platforms/posix/handler.hpp
rename to vmime/platforms/posix/handler.hpp
index a284e5ab..c38ceec1 100644
--- a/src/platforms/posix/handler.hpp
+++ b/vmime/platforms/posix/handler.hpp
@@ -21,15 +21,15 @@
 #define VMIME_PLATFORMS_POSIX_HANDLER_HPP_INCLUDED
 
 
-#include "config.hpp"
-#include "platformDependant.hpp"
+#include "vmime/config.hpp"
+#include "vmime/platformDependant.hpp"
 
 #if VMIME_HAVE_MESSAGING_FEATURES
-	#include "platforms/posix/socket.hpp"
+	#include "vmime/platforms/posix/socket.hpp"
 #endif
 
 #if VMIME_HAVE_FILESYSTEM_FEATURES
-     #include "platforms/posix/file.hpp"
+     #include "vmime/platforms/posix/file.hpp"
 #endif
 
 
diff --git a/src/platforms/posix/socket.hpp b/vmime/platforms/posix/socket.hpp
similarity index 97%
rename from src/platforms/posix/socket.hpp
rename to vmime/platforms/posix/socket.hpp
index 83291bbf..f6864818 100644
--- a/src/platforms/posix/socket.hpp
+++ b/vmime/platforms/posix/socket.hpp
@@ -21,7 +21,7 @@
 #define VMIME_PLATFORMS_POSIX_SOCKET_HPP_INCLUDED
 
 
-#include "messaging/socket.hpp"
+#include "vmime/messaging/socket.hpp"
 
 
 #if VMIME_HAVE_MESSAGING_FEATURES
diff --git a/src/propertySet.hpp b/vmime/propertySet.hpp
similarity index 98%
rename from src/propertySet.hpp
rename to vmime/propertySet.hpp
index 569c994d..37f8635d 100644
--- a/src/propertySet.hpp
+++ b/vmime/propertySet.hpp
@@ -26,10 +26,10 @@
 #include <algorithm>
 #include <sstream>
 
-#include "base.hpp"
-#include "exception.hpp"
+#include "vmime/base.hpp"
+#include "vmime/exception.hpp"
 
-#include "utility/stringUtils.hpp"
+#include "vmime/utility/stringUtils.hpp"
 
 
 namespace vmime
diff --git a/src/relay.hpp b/vmime/relay.hpp
similarity index 96%
rename from src/relay.hpp
rename to vmime/relay.hpp
index aac9d2bc..d26d77c0 100644
--- a/src/relay.hpp
+++ b/vmime/relay.hpp
@@ -21,10 +21,10 @@
 #define VMIME_RELAY_HPP_INCLUDED
 
 
-#include "base.hpp"
-#include "component.hpp"
+#include "vmime/base.hpp"
+#include "vmime/component.hpp"
 
-#include "dateTime.hpp"
+#include "vmime/dateTime.hpp"
 
 
 namespace vmime
diff --git a/src/standardFields.hpp b/vmime/standardFields.hpp
similarity index 87%
rename from src/standardFields.hpp
rename to vmime/standardFields.hpp
index f329069d..cd9b9289 100644
--- a/src/standardFields.hpp
+++ b/vmime/standardFields.hpp
@@ -21,18 +21,18 @@
 #define VMIME_STANDARDFIELDS_HPP_INCLUDED
 
 
-#include "genericField.hpp"
-#include "parameterizedHeaderField.hpp"
-#include "headerFieldFactory.hpp"
+#include "vmime/genericField.hpp"
+#include "vmime/parameterizedHeaderField.hpp"
+#include "vmime/headerFieldFactory.hpp"
 
 // Inclusion for field value types
-#include "addressList.hpp"
-#include "encoding.hpp"
-#include "dateTime.hpp"
-#include "text.hpp"
-#include "messageId.hpp"
-#include "relay.hpp"
-#include "mailboxList.hpp"
+#include "vmime/addressList.hpp"
+#include "vmime/encoding.hpp"
+#include "vmime/dateTime.hpp"
+#include "vmime/text.hpp"
+#include "vmime/messageId.hpp"
+#include "vmime/relay.hpp"
+#include "vmime/mailboxList.hpp"
 
 
 namespace vmime
diff --git a/src/standardParams.hpp b/vmime/standardParams.hpp
similarity index 94%
rename from src/standardParams.hpp
rename to vmime/standardParams.hpp
index 340f290b..325e2e06 100644
--- a/src/standardParams.hpp
+++ b/vmime/standardParams.hpp
@@ -21,11 +21,11 @@
 #define VMIME_STANDARDPARAMS_HPP_INCLUDED
 
 
-#include "genericParameter.hpp"
+#include "vmime/genericParameter.hpp"
 
 // Inclusion for field value types
-#include "dateTime.hpp"
-#include "charset.hpp"
+#include "vmime/dateTime.hpp"
+#include "vmime/charset.hpp"
 
 
 namespace vmime
diff --git a/src/text.hpp b/vmime/text.hpp
similarity index 99%
rename from src/text.hpp
rename to vmime/text.hpp
index 8af0c78d..12692566 100644
--- a/src/text.hpp
+++ b/vmime/text.hpp
@@ -21,8 +21,8 @@
 #define VMIME_TEXT_HPP_INCLUDED
 
 
-#include "base.hpp"
-#include "word.hpp"
+#include "vmime/base.hpp"
+#include "vmime/word.hpp"
 
 
 namespace vmime
diff --git a/src/textPart.hpp b/vmime/textPart.hpp
similarity index 94%
rename from src/textPart.hpp
rename to vmime/textPart.hpp
index 412493d3..54f5c569 100644
--- a/src/textPart.hpp
+++ b/vmime/textPart.hpp
@@ -21,11 +21,11 @@
 #define VMIME_TEXTPART_HPP_INCLUDED
 
 
-#include "bodyPart.hpp"
+#include "vmime/bodyPart.hpp"
 
-#include "mediaType.hpp"
-#include "charset.hpp"
-#include "contentHandler.hpp"
+#include "vmime/mediaType.hpp"
+#include "vmime/charset.hpp"
+#include "vmime/contentHandler.hpp"
 
 
 namespace vmime
diff --git a/src/textPartFactory.hpp b/vmime/textPartFactory.hpp
similarity index 94%
rename from src/textPartFactory.hpp
rename to vmime/textPartFactory.hpp
index 2193f843..66e45222 100644
--- a/src/textPartFactory.hpp
+++ b/vmime/textPartFactory.hpp
@@ -21,9 +21,9 @@
 #define VMIME_TEXTPARTFACTORY_HPP_INCLUDED
 
 
-#include "textPart.hpp"
-#include "mediaType.hpp"
-#include "utility/singleton.hpp"
+#include "vmime/textPart.hpp"
+#include "vmime/mediaType.hpp"
+#include "vmime/utility/singleton.hpp"
 
 
 namespace vmime
diff --git a/src/typeAdapter.hpp b/vmime/typeAdapter.hpp
similarity index 98%
rename from src/typeAdapter.hpp
rename to vmime/typeAdapter.hpp
index cd82816c..8493232c 100644
--- a/src/typeAdapter.hpp
+++ b/vmime/typeAdapter.hpp
@@ -23,7 +23,7 @@
 
 #include <sstream>
 
-#include "component.hpp"
+#include "vmime/component.hpp"
 
 
 namespace vmime
diff --git a/src/types.hpp b/vmime/types.hpp
similarity index 97%
rename from src/types.hpp
rename to vmime/types.hpp
index 7f20ce8a..0fdf5b75 100644
--- a/src/types.hpp
+++ b/vmime/types.hpp
@@ -24,7 +24,7 @@
 #include <limits>
 #include <string>
 
-#include "config.hpp"
+#include "vmime/config.hpp"
 
 
 namespace vmime
diff --git a/src/utility/file.hpp b/vmime/utility/file.hpp
similarity index 98%
rename from src/utility/file.hpp
rename to vmime/utility/file.hpp
index 6697d3d7..0ddf0760 100644
--- a/src/utility/file.hpp
+++ b/vmime/utility/file.hpp
@@ -21,10 +21,10 @@
 #define VMIME_UTILITY_FILE_HPP_INCLUDED
 
 
-#include "config.hpp"
+#include "vmime/config.hpp"
 
-#include "utility/path.hpp"
-#include "utility/stream.hpp"
+#include "vmime/utility/path.hpp"
+#include "vmime/utility/stream.hpp"
 
 
 #if VMIME_HAVE_FILESYSTEM_FEATURES
diff --git a/src/utility/md5.hpp b/vmime/utility/md5.hpp
similarity index 96%
rename from src/utility/md5.hpp
rename to vmime/utility/md5.hpp
index dc9bb384..e61e4d69 100644
--- a/src/utility/md5.hpp
+++ b/vmime/utility/md5.hpp
@@ -21,8 +21,8 @@
 #define VMIME_UTILITY_MD5_HPP_INCLUDED
 
 
-#include "base.hpp"
-#include "config.hpp"
+#include "vmime/base.hpp"
+#include "vmime/config.hpp"
 
 
 namespace vmime {
diff --git a/src/utility/path.hpp b/vmime/utility/path.hpp
similarity index 98%
rename from src/utility/path.hpp
rename to vmime/utility/path.hpp
index 01e78935..d04844b4 100644
--- a/src/utility/path.hpp
+++ b/vmime/utility/path.hpp
@@ -23,8 +23,8 @@
 
 #include <vector>
 
-#include "types.hpp"
-#include "word.hpp"
+#include "vmime/types.hpp"
+#include "vmime/word.hpp"
 
 
 namespace vmime {
diff --git a/src/utility/random.hpp b/vmime/utility/random.hpp
similarity index 98%
rename from src/utility/random.hpp
rename to vmime/utility/random.hpp
index 442905a5..b3b2dd36 100644
--- a/src/utility/random.hpp
+++ b/vmime/utility/random.hpp
@@ -21,7 +21,7 @@
 #define VMIME_UTILITY_RANDOM_HPP_INCLUDED
 
 
-#include "types.hpp"
+#include "vmime/types.hpp"
 
 
 namespace vmime {
diff --git a/src/utility/singleton.hpp b/vmime/utility/singleton.hpp
similarity index 100%
rename from src/utility/singleton.hpp
rename to vmime/utility/singleton.hpp
diff --git a/src/utility/smartPtr.hpp b/vmime/utility/smartPtr.hpp
similarity index 100%
rename from src/utility/smartPtr.hpp
rename to vmime/utility/smartPtr.hpp
diff --git a/src/utility/stream.hpp b/vmime/utility/stream.hpp
similarity index 99%
rename from src/utility/stream.hpp
rename to vmime/utility/stream.hpp
index f05df243..4edcbe3e 100644
--- a/src/utility/stream.hpp
+++ b/vmime/utility/stream.hpp
@@ -24,7 +24,7 @@
 #include <istream>
 #include <ostream>
 
-#include "types.hpp"
+#include "vmime/types.hpp"
 
 
 namespace vmime {
diff --git a/src/utility/stringProxy.hpp b/vmime/utility/stringProxy.hpp
similarity index 97%
rename from src/utility/stringProxy.hpp
rename to vmime/utility/stringProxy.hpp
index 97a27ecd..95bb9918 100644
--- a/src/utility/stringProxy.hpp
+++ b/vmime/utility/stringProxy.hpp
@@ -23,8 +23,8 @@
 
 #include <limits>
 
-#include "types.hpp"
-#include "utility/stream.hpp"
+#include "vmime/types.hpp"
+#include "vmime/utility/stream.hpp"
 
 
 namespace vmime {
diff --git a/src/utility/stringUtils.hpp b/vmime/utility/stringUtils.hpp
similarity index 98%
rename from src/utility/stringUtils.hpp
rename to vmime/utility/stringUtils.hpp
index 95b94a52..d75765e8 100644
--- a/src/utility/stringUtils.hpp
+++ b/vmime/utility/stringUtils.hpp
@@ -21,8 +21,8 @@
 #define VMIME_STRINGUTILS_HPP_INCLUDED
 
 
-#include "types.hpp"
-#include "base.hpp"
+#include "vmime/types.hpp"
+#include "vmime/base.hpp"
 
 #include <sstream>
 
diff --git a/vmime/vmime.hpp b/vmime/vmime.hpp
new file mode 100644
index 00000000..849b497e
--- /dev/null
+++ b/vmime/vmime.hpp
@@ -0,0 +1,92 @@
+//
+// VMime library (http://vmime.sourceforge.net)
+// Copyright (C) 2002-2004 Vincent Richard <vincent@vincent-richard.net>
+//
+// 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) any later version.
+//
+// This program 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.
+//
+// You should.have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//
+
+#ifndef VMIME_INCLUDED
+#define VMIME_INCLUDED
+
+
+// Configuration
+#include "vmime/config.hpp"
+
+// Base definitions
+#include "vmime/base.hpp"
+#include "vmime/exception.hpp"
+#include "vmime/options.hpp"
+#include "vmime/platformDependant.hpp"
+
+// Base components
+#include "vmime/dateTime.hpp"
+#include "vmime/message.hpp"
+#include "vmime/bodyPart.hpp"
+#include "vmime/charset.hpp"
+#include "vmime/text.hpp"
+#include "vmime/encoding.hpp"
+#include "vmime/contentDisposition.hpp"
+#include "vmime/mailbox.hpp"
+#include "vmime/mailboxGroup.hpp"
+#include "vmime/mailboxList.hpp"
+#include "vmime/addressList.hpp"
+#include "vmime/mediaType.hpp"
+#include "vmime/messageId.hpp"
+#include "vmime/relay.hpp"
+
+// Message components
+#include "vmime/message.hpp"
+
+// Header fields
+#include "vmime/headerFieldFactory.hpp"
+#include "vmime/mailboxField.hpp"
+#include "vmime/parameterizedHeaderField.hpp"
+#include "vmime/standardFields.hpp"
+
+// Encoders
+#include "vmime/encoderFactory.hpp"
+
+// Message builder/parser
+#include "vmime/messageBuilder.hpp"
+#include "vmime/messageParser.hpp"
+
+#include "vmime/fileAttachment.hpp"
+#include "vmime/defaultAttachment.hpp"
+
+#include "vmime/plainTextPart.hpp"
+#include "vmime/htmlTextPart.hpp"
+
+// Property set
+#include "vmime/propertySet.hpp"
+
+// Messaging features
+#if VMIME_HAVE_MESSAGING_FEATURES
+	#include "vmime/messaging/socket.hpp"
+
+	#include "vmime/messaging/service.hpp"
+	#include "vmime/messaging/store.hpp"
+	#include "vmime/messaging/transport.hpp"
+
+	#include "vmime/messaging/session.hpp"
+	#include "vmime/messaging/authenticator.hpp"
+	#include "vmime/messaging/defaultAuthenticator.hpp"
+	#include "vmime/messaging/simpleAuthenticator.hpp"
+
+	#include "vmime/messaging/folder.hpp"
+	#include "vmime/messaging/message.hpp"
+#endif // VMIME_HAVE_MESSAGING_FEATURES
+
+
+#endif // VMIME_INCLUDED
diff --git a/src/word.hpp b/vmime/word.hpp
similarity index 98%
rename from src/word.hpp
rename to vmime/word.hpp
index 22f791ca..fc036662 100644
--- a/src/word.hpp
+++ b/vmime/word.hpp
@@ -21,7 +21,7 @@
 #define VMIME_WORD_HPP_INCLUDED
 
 
-#include "charset.hpp"
+#include "vmime/charset.hpp"
 
 
 namespace vmime