UI Updates

Update to comments and some annotations. Also updated the Build.xml
src.dir and srctest.dir path to remove reference to old directory.