reorganized files and consolidated users table in admin and superadmin