Revert "No need for full filesystem path in the zip."

This reverts commit 735f360419e8446f4f805b40e81b906062eb85a1.
Revert "A new level of *keep xda out*"

This reverts commit 522228f3bd177ba19b768bbfa2d98ad743605cd3.
Update directory naming