reorganize tree to merge projects

git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/user_dworley_redirect@4813 a612230a-c5fa-0310-af8b-88eea846685b