diff --git a/Socket/FileHandle.hh b/Socket/FileHandle.hh
index 1f29b893e7aeb7efbf9aeb8b1625d322af7428e2..3bc615551db44fef6e12fbaf7e287f760036406f 100644
--- a/Socket/FileHandle.hh
+++ b/Socket/FileHandle.hh
@@ -20,6 +20,14 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+/** \mainpage The SENF Socket Library
+
+\section arch Overall Architecture
+
+\image html "../../SocketLibrary-classes.png" Class Diagram
+
+ */
+
 #ifndef HH_FileHandle_
 #define HH_FileHandle_ 1
 
diff --git a/Socket/SConscript b/Socket/SConscript
index 1375a71b66400082f73520ffe85b9189f52b1e3d..d0ba53c5799480c4214b497d9c5bd369f31e4271 100644
--- a/Socket/SConscript
+++ b/Socket/SConscript
@@ -12,4 +12,5 @@ SatSCons.Lib(env,
              sources = sources,
              LIBS = [ 'Utils' ])
 
-SatSCons.Doxygen(env,sources)
+SatSCons.Doxygen(env,sources,
+                 image=[ 'SocketLibrary-classes.dia' ])
diff --git a/Socket/SocketLibrary-classes.dia b/Socket/SocketLibrary-classes.dia
new file mode 100644
index 0000000000000000000000000000000000000000..679f3d18e56b156f305ed731bca40678c83738f2
Binary files /dev/null and b/Socket/SocketLibrary-classes.dia differ
diff --git a/satscons/Doxyfile.template b/satscons/Doxyfile.template
index 3a08b6331bdc96aea7ff7620e7d2ede6059e1f14..8fda8a0f8a04357153cab62d2fae0d10b18c20b2 100644
--- a/satscons/Doxyfile.template
+++ b/satscons/Doxyfile.template
@@ -124,7 +124,8 @@ FILE_PATTERNS          = *.c \
                          *.cci \
                          *.ct \
                          *.cti \
-                         *.ih
+                         *.ih \
+			 *.mpp
 RECURSIVE              = NO
 EXCLUDE                = doc
 EXCLUDE_SYMLINKS       = NO
@@ -159,7 +160,7 @@ HTML_OUTPUT            = html
 HTML_FILE_EXTENSION    = .html
 HTML_HEADER            = 
 HTML_FOOTER            = 
-HTML_STYLESHEET        = satcom.css
+HTML_STYLESHEET        = 
 HTML_ALIGN_MEMBERS     = YES
 GENERATE_HTMLHELP      = NO
 CHM_FILE               = 
diff --git a/satscons/SConscript.template b/satscons/SConscript.template
index 771c9be2f24c96171a507b0c629e222d3d8b9562..fc1c095c2a0c3e2eb9d7750f54fc5fb2dc5ba0fa 100644
--- a/satscons/SConscript.template
+++ b/satscons/SConscript.template
@@ -6,5 +6,5 @@ import SatSCons
 SatSCons.StandardTargets(env)
 
 # SatSCons.Lib(env,
-               library = 'Test',
-               sources = SatSCons.GlobSources())
+#               library = 'Test',
+#               sources = SatSCons.GlobSources())
diff --git a/satscons/satconf.py b/satscons/satconf.py
deleted file mode 100644
index bf67150ff037992a1fcf5c562aa943a889e06b2f..0000000000000000000000000000000000000000
--- a/satscons/satconf.py
+++ /dev/null
@@ -1,2 +0,0 @@
-import SCons.Options, SCons.SConf, SCons.Environment
-