Revert "NOTE: change everything to be under user group"

This reverts commit 2485f10a0d654cf7f3c58e37a9340cd075d7946d.