/lib/user/ moved to /lib/users/
Revert "/lib/user/ moved to /lib/users/"

This reverts commit 00e468fc0bdedf603eea9ee86ca4476660b46ea2.
/lib/rooms/ moved to /lib/room/