minor reformattings
restructuring for ant deployment