initial commit and passing from makefile to ant, with some cleanup in directories