diff --git a/src/mrw/arg.cxx b/src/arg.cxx
similarity index 100%
rename from src/mrw/arg.cxx
rename to src/arg.cxx
diff --git a/src/mrw/autofunctiontracelog4cxx.cxx b/src/autofunctiontracelog4cxx.cxx
similarity index 100%
rename from src/mrw/autofunctiontracelog4cxx.cxx
rename to src/autofunctiontracelog4cxx.cxx
diff --git a/src/mrw/autofunctiontracestdlog.cxx b/src/autofunctiontracestdlog.cxx
similarity index 100%
rename from src/mrw/autofunctiontracestdlog.cxx
rename to src/autofunctiontracestdlog.cxx
diff --git a/src/mrw/autostacktracelog4cxx.cxx b/src/autostacktracelog4cxx.cxx
similarity index 100%
rename from src/mrw/autostacktracelog4cxx.cxx
rename to src/autostacktracelog4cxx.cxx
diff --git a/src/mrw/autostacktracestderr.cxx b/src/autostacktracestderr.cxx
similarity index 100%
rename from src/mrw/autostacktracestderr.cxx
rename to src/autostacktracestderr.cxx
diff --git a/src/mrw/configfile.cxx b/src/configfile.cxx
similarity index 100%
rename from src/mrw/configfile.cxx
rename to src/configfile.cxx
diff --git a/src/mrw/errno.cxx b/src/errno.cxx
similarity index 100%
rename from src/mrw/errno.cxx
rename to src/errno.cxx
diff --git a/src/mrw/exception.cxx b/src/exception.cxx
similarity index 100%
rename from src/mrw/exception.cxx
rename to src/exception.cxx
diff --git a/src/mrw/exec.cxx b/src/exec.cxx
similarity index 100%
rename from src/mrw/exec.cxx
rename to src/exec.cxx
diff --git a/src/mrw/functiontrace.cxx b/src/functiontrace.cxx
similarity index 100%
rename from src/mrw/functiontrace.cxx
rename to src/functiontrace.cxx
diff --git a/src/mrw/log4cxxconfiguration.cxx b/src/log4cxxconfiguration.cxx
similarity index 100%
rename from src/mrw/log4cxxconfiguration.cxx
rename to src/log4cxxconfiguration.cxx
diff --git a/src/main.cxx b/src/main.cxx
deleted file mode 100644
index b3e39e0..0000000
--- a/src/main.cxx
+++ /dev/null
@@ -1,14 +0,0 @@
-/*! @file
-
-    @id $Id: main.cxx 9 2009-04-02 12:54:44Z marwae $
-
-*/
-//       1         2         3         4         5         6         7         8
-// 45678901234567890123456789012345678901234567890123456789012345678901234567890
-
-
-int main(int argv, char** argc) try {
- } catch (...) {
-  // unexpected exception - just terminate
-  return 1;
- }
diff --git a/src/mrw/regexp.cxx b/src/regexp.cxx
similarity index 100%
rename from src/mrw/regexp.cxx
rename to src/regexp.cxx
diff --git a/src/mrw/stacktrace.cxx b/src/stacktrace.cxx
similarity index 100%
rename from src/mrw/stacktrace.cxx
rename to src/stacktrace.cxx
diff --git a/src/mrw/stdext.cxx b/src/stdext.cxx
similarity index 100%
rename from src/mrw/stdext.cxx
rename to src/stdext.cxx
diff --git a/src/mrw/auto_test.cxx b/test/auto_test.cxx
similarity index 100%
rename from src/mrw/auto_test.cxx
rename to test/auto_test.cxx
diff --git a/src/mrw/configfile_check.sh b/test/configfile_check.sh
similarity index 100%
rename from src/mrw/configfile_check.sh
rename to test/configfile_check.sh
diff --git a/src/mrw/configfile_test.cxx b/test/configfile_test.cxx
similarity index 100%
rename from src/mrw/configfile_test.cxx
rename to test/configfile_test.cxx
diff --git a/src/mrw/dynamiclibrary_test.cxx b/test/dynamiclibrary_test.cxx
similarity index 100%
rename from src/mrw/dynamiclibrary_test.cxx
rename to test/dynamiclibrary_test.cxx
diff --git a/src/mrw/dynamiclibrary_testlib.cxx b/test/dynamiclibrary_testlib.cxx
similarity index 100%
rename from src/mrw/dynamiclibrary_testlib.cxx
rename to test/dynamiclibrary_testlib.cxx
diff --git a/src/mrw/exec_test.cxx b/test/exec_test.cxx
similarity index 100%
rename from src/mrw/exec_test.cxx
rename to test/exec_test.cxx
diff --git a/src/mrw/functiontrace_test.cxx b/test/functiontrace_test.cxx
similarity index 100%
rename from src/mrw/functiontrace_test.cxx
rename to test/functiontrace_test.cxx
diff --git a/src/mrw/mrwautofunctiontracelog4cxx_test.cxx b/test/mrwautofunctiontracelog4cxx_test.cxx
similarity index 100%
rename from src/mrw/mrwautofunctiontracelog4cxx_test.cxx
rename to test/mrwautofunctiontracelog4cxx_test.cxx
diff --git a/src/mrw/mrwexclog4cxx_test.cxx b/test/mrwexclog4cxx_test.cxx
similarity index 100%
rename from src/mrw/mrwexclog4cxx_test.cxx
rename to test/mrwexclog4cxx_test.cxx
diff --git a/src/mrw/mrwexcstderr_test.cxx b/test/mrwexcstderr_test.cxx
similarity index 100%
rename from src/mrw/mrwexcstderr_test.cxx
rename to test/mrwexcstderr_test.cxx
diff --git a/src/mrw/regexp_test.cxx b/test/regexp_test.cxx
similarity index 100%
rename from src/mrw/regexp_test.cxx
rename to test/regexp_test.cxx
diff --git a/src/mrw/smartpointer_test.cxx b/test/smartpointer_test.cxx
similarity index 100%
rename from src/mrw/smartpointer_test.cxx
rename to test/smartpointer_test.cxx
diff --git a/src/mrw/stacktrace_test.cxx b/test/stacktrace_test.cxx
similarity index 100%
rename from src/mrw/stacktrace_test.cxx
rename to test/stacktrace_test.cxx
diff --git a/src/mrw/stdext_test.cxx b/test/stdext_test.cxx
similarity index 100%
rename from src/mrw/stdext_test.cxx
rename to test/stdext_test.cxx
diff --git a/src/mrw/string_test.cxx b/test/string_test.cxx
similarity index 100%
rename from src/mrw/string_test.cxx
rename to test/string_test.cxx
diff --git a/src/mrw/test.dat b/test/test.dat
similarity index 100%
rename from src/mrw/test.dat
rename to test/test.dat
diff --git a/src/mrw/tokenizer_test.cxx b/test/tokenizer_test.cxx
similarity index 100%
rename from src/mrw/tokenizer_test.cxx
rename to test/tokenizer_test.cxx