folders organization + improved /users/