#6: now supporting multiple users and standard fs layout