Index: /trunk/FACT++/Makefile.am
===================================================================
--- /trunk/FACT++/Makefile.am	(revision 10361)
+++ /trunk/FACT++/Makefile.am	(revision 10362)
@@ -10,5 +10,5 @@
 AM_CPPFLAGS = \
    -O3 -Wall -Winit-self -Wpointer-arith -Wcast-align -Wextra -Wformat=2 \
-   -Idim_v19r15/dim $(DIM_FLAGS) $(BOOST_FLAGS)
+   -Idim/dim $(DIM_FLAGS) $(BOOST_FLAGS)
 
 AM_CXXFLAGS = $(AM_CPPFLAGS) -Woverloaded-virtual -Wshadow -std=c++0x
@@ -41,18 +41,18 @@
 EXTRA_DIST = \
 	Doxyfile \
-	dim_v19r15/DIM_Performance.pdf \
-	dim_v19r15/LICENSE.GPL \
-	dim_v19r15/README.txt \
-	dim_v19r15/README_v9.txt \
-	dim_v19r15/README_v10.txt \
-	dim_v19r15/README_v11.txt \
-	dim_v19r15/README_v12.txt \
-	dim_v19r15/README_v13.txt \
-	dim_v19r15/README_v14.txt \
-	dim_v19r15/README_v15.txt \
-	dim_v19r15/README_v16.txt \
-	dim_v19r15/README_v17.txt \
-	dim_v19r15/README_v18.txt \
-	dim_v19r15/README_v19.txt
+	dim/DIM_Performance.pdf \
+	dim/LICENSE.GPL \
+	dim/README.txt \
+	dim/README_v9.txt \
+	dim/README_v10.txt \
+	dim/README_v11.txt \
+	dim/README_v12.txt \
+	dim/README_v13.txt \
+	dim/README_v14.txt \
+	dim/README_v17.txt \
+	dim/README_v16.txt \
+	dim/README_v17.txt \
+	dim/README_v18.txt \
+	dim/README_v19.txt
 
 EXTRA_DIST += $(dist_man1_MANS:.man=.html) $(dist_man1_MANS:.man=.pdf)
@@ -60,13 +60,13 @@
 
 dns_LDADD    = libDim.la
-dns_SOURCES  = dim_v19r15/src/dns.c
+dns_SOURCES  = dim/src/dns.c
 #dns_CPPFLAGS = $(AM_CPPFLAGS) $(DIM_FLAGS)
 
 did_LDADD    = libDim.la 
-did_CPPFLAGS = $(AM_CPPFLAGS) -Idim_v19r15/src/did 
+did_CPPFLAGS = $(AM_CPPFLAGS) -Idim/src/did 
 did_SOURCES  = \
-	dim_v19r15/src/did/did.c dim_v19r15/src/did/did.h \
-	dim_v19r15/src/did/dui_util.c dim_v19r15/src/did/dui_util.h \
-	dim_v19r15/src/did/dui_colors.h
+	dim/src/did/did.c dim/src/did/did.h \
+	dim/src/did/dui_util.c dim/src/did/dui_util.h \
+	dim/src/did/dui_colors.h
 
 
@@ -74,56 +74,46 @@
 libDim_ladir = 
 libDim_la_HEADERS = \
-	dim_v19r15/dim/dic.h \
-	dim_v19r15/dim/dim_common.h \
-	dim_v19r15/dim/dim.h \
-	dim_v19r15/dim/dim_tcpip.h \
-	dim_v19r15/dim/dis.h 
+	dim/dim/dic.h \
+	dim/dim/dim_common.h \
+	dim/dim/dim.h \
+	dim/dim/dim_tcpip.h \
+	dim/dim/dis.h 
 
 libDim_la_SOURCES = \
-	dim_v19r15/src/dic.c \
-	dim_v19r15/src/dis.c \
-	dim_v19r15/src/dna.c \
-	dim_v19r15/src/sll.c \
-	dim_v19r15/src/dll.c  \
-	dim_v19r15/src/hash.c \
-	dim_v19r15/src/swap.c \
-	dim_v19r15/src/copy_swap.c \
-	dim_v19r15/src/open_dns.c \
-	dim_v19r15/src/conn_handler.c \
-	dim_v19r15/src/tcpip.c \
-	dim_v19r15/src/dtq.c \
-	dim_v19r15/src/dim_thr.c \
-	dim_v19r15/src/utilities.c
+	dim/src/dic.c \
+	dim/src/dis.c \
+	dim/src/dna.c \
+	dim/src/sll.c \
+	dim/src/dll.c  \
+	dim/src/hash.c \
+	dim/src/swap.c \
+	dim/src/copy_swap.c \
+	dim/src/open_dns.c \
+	dim/src/conn_handler.c \
+	dim/src/tcpip.c \
+	dim/src/dtq.c \
+	dim/src/dim_thr.c \
+	dim/src/utilities.c
 
 #libDimCpp_la_CXXFLAGS = $(AM_CXXFLAGS) $(DIM_FLAGS)
 libDim___ladir =
 libDim___la_HEADERS = \
-	dim_v19r15/dim/dic.hxx \
-	dim_v19r15/dim/dis.hxx \
-	dim_v19r15/dim/dim_core.hxx \
-	dim_v19r15/dim/dim.hxx \
-	dim_v19r15/dim/dim_tcpip.h \
-	dim_v19r15/dim/dllist.hxx \
-	dim_v19r15/dim/sllist.hxx \
-	dim_v19r15/dim/tokenstring.hxx 
+	dim/dim/dic.hxx \
+	dim/dim/dis.hxx \
+	dim/dim/dim_core.hxx \
+	dim/dim/dim.hxx \
+	dim/dim/dim_tcpip.h \
+	dim/dim/dllist.hxx \
+	dim/dim/sllist.hxx \
+	dim/dim/tokenstring.hxx 
 	
 libDim___la_SOURCES = \
-	dim_v19r15/src/diccpp.cxx \
-	dim_v19r15/src/dimcpp.cxx \
-	dim_v19r15/src/tokenstring.cxx \
-	dim_v19r15/src/discpp.cxx 
-
-# Divide into Tools/StateMachine/Shell/TcpIp
+	dim/src/diccpp.cxx \
+	dim/src/dimcpp.cxx \
+	dim/src/tokenstring.cxx \
+	dim/src/discpp.cxx 
+
+# Divide into Readline / StateMachine / StateMachineDim / Tools?
 libStateMachine_la_SOURCES = \
-	src/EventImp.h        src/EventImp.cc \
-	src/Event.h           src/Event.cc \
-	src/MessageImp.h      src/MessageImp.cc \
-	src/MessageDim.h      src/MessageDim.cc \
-	src/Converter.h       src/Converter.cc \
-	src/StateMachineImp.h src/StateMachineImp.cc \
-	src/StateMachineDim.h src/StateMachineDim.cc \
-	src/StateMachine.h    src/StateMachine.cc \
-	src/ServiceList.h     src/ServiceList.cc \
-	src/DimErrorRedirecter.cc \
 	src/WindowLog.h       src/WindowLog.cc \
 	src/Readline.h        src/Readline.cc \
@@ -132,10 +122,23 @@
 	src/Console.h         src/Console.cc \
 	src/Shell.h           src/Shell.cc \
+	\
+	src/EventImp.h        src/EventImp.cc \
+	src/Event.h           src/Event.cc \
 	src/Description.h     src/Description.cc \
+	src/MessageImp.h      src/MessageImp.cc \
+	src/Converter.h       src/Converter.cc \
+	src/StateMachineImp.h src/StateMachineImp.cc \
+	src/StateMachine.h    src/StateMachine.cc \
+	\
+	src/EventDim.h \
+	src/MessageDim.h      src/MessageDim.cc \
+	src/StateMachineDim.h src/StateMachineDim.cc \
+	src/ServiceList.h     src/ServiceList.cc \
+	src/DimErrorRedirecter.h  \
+	src/DimErrorRedirecter.cc \
 	src/DimDescriptionService.h \
 	src/DimDescriptionService.cc \
-	src/Connection.h      src/Connection.cc \
-	src/EventDim.h \
-	src/DimErrorRedirecter.h
+	\
+	src/Connection.h      src/Connection.cc