Updated packages. Add user/role classes, reorganize classes