Refactoring, final
Reorganize user lists