adjustments after recent changes of code base, clean up of dependencies, added deployment descriptor