Reorganize rest packages and classes
Update methods to Users logic.