Changed package structure and updated javadocs, updated build.xml
Minor code layout changes in build.xml