First attempt at restructure.  Also updated the build.xml with new project paths.'