Reorganised users' structure one more time