Revert "privacy improvements"

This reverts commit 9ca249efea866c6fa3641b27999efca136d30964.
folder restructuring