Changed directory layout. Also replaced 'Makefile' with Ant's 'build.xml' file