Add user management and restructure
Fixed a bug in the test cases