Fixed weird directory structure and committing missing libs.
Fixed strange issue w.r.t. XStream deserialisation.