...
Changed directory layout (for future maven migration).
Improved build.xml