make properties and documents as separate folders; fix build to use distZip
fix build.gradle conflicts