different svn layout used in this module -- moved svn trunk files
to project root and deleted branches and tags
Merge branch 'module-reorg' into module-reorg2