fixed: package structure, build.xml; added: lib