Move libraries from ant/lib to more appropriate locations