Remove unneeded support library references
Modularize Ant targets
Merge classpath declarations
Fix whitespace and indentation
Simplify and fix classpath references