diff --git a/.gitignore b/.gitignore
index 2ecf32ec75..7d24144a0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,9 +79,6 @@ packages/*/debug/
 # no idea
 /packages/*/.rpt2_cache
 
-# packages in development
-packages/arcgis-rest-portal/
-
 #
 test.html
 test.js
diff --git a/README.md b/README.md
index a9b6129d42..7405681923 100644
--- a/README.md
+++ b/README.md
@@ -72,10 +72,7 @@ Some useful commands include:
 * [`@esri/arcgis-rest-request`](./packages/arcgis-rest-request/) - Underpins other packages and supports making low-level requests.
 * [`@esri/arcgis-rest-auth`](./packages/arcgis-rest-auth) - Provides methods for authenticating named users and applications.
 * [`@esri/arcgis-rest-common`](./packages/arcgis-rest-common-types) - - Stores shared methods and types used throughout the ArcGIS API.
-* [`@esri/arcgis-rest-items`](./packages/arcgis-rest-items) - Methods for working with ArcGIS Online/Enterprise content.
-* [`@esri/arcgis-rest-groups`](./packages/arcgis-rest-groups) - Methods for working with ArcGIS Online/Enterprise groups.
-* [`@esri/arcgis-rest-users`](./packages/arcgis-rest-users) - Methods for working with ArcGIS Online/Enterprise users.
-* [`@esri/arcgis-rest-sharing`](./packages/arcgis-rest-sharing) - Methods for updating permissions for ArcGIS Online/Enterprise content.
+* [`@esri/arcgis-rest-portal`](./packages/arcgis-rest-portal) - Methods for working with ArcGIS Online/Enterprise content and users.
 * [`@esri/arcgis-rest-feature-service`](./packages/arcgis-rest-feature-service) - Functions for creating and updating feature services and querying and editing the features they contain.
 * [`@esri/arcgis-rest-geocoder`](./packages/arcgis-rest-geocoder) - Geocoding wrapper for `@esri/arcgis-rest-js`
 * [`@esri/arcgis-rest-routing`](./packages/arcgis-rest-routing) - Routing and directions wrapper for `@esri/arcgis-rest-js`.
diff --git a/demos/ago-node-cli/lib/item-export-command.js b/demos/ago-node-cli/lib/item-export-command.js
index c0cde38ce7..65e57d962b 100644
--- a/demos/ago-node-cli/lib/item-export-command.js
+++ b/demos/ago-node-cli/lib/item-export-command.js
@@ -1,4 +1,4 @@
-const { getItem, getItemData } = require("@esri/arcgis-rest-items");
+const { getItem, getItemData } = require("@esri/arcgis-rest-portal");
 const jsonfile = require('jsonfile');
 
 module.exports = {
diff --git a/demos/ago-node-cli/lib/item-search-command.js b/demos/ago-node-cli/lib/item-search-command.js
index 8b598c0a5c..e3b67f0e2b 100644
--- a/demos/ago-node-cli/lib/item-search-command.js
+++ b/demos/ago-node-cli/lib/item-search-command.js
@@ -2,7 +2,7 @@
 /**
  * Bring in searchItems fn
  */
-const { searchItems } = require("@esri/arcgis-rest-items");
+const { searchItems } = require("@esri/arcgis-rest-portal");
 
 module.exports = {
   /**
@@ -10,7 +10,7 @@ module.exports = {
    */
   execute: function (query) {
     // construct the search call..
-    return searchItems({ 
+    return searchItems({
       searchForm: {
         q: query,
         start: 1,
diff --git a/demos/ago-node-cli/package.json b/demos/ago-node-cli/package.json
index 61a193afdc..c79a78fbf9 100644
--- a/demos/ago-node-cli/package.json
+++ b/demos/ago-node-cli/package.json
@@ -19,7 +19,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@esri/arcgis-rest-auth": "^1.19.2",
-    "@esri/arcgis-rest-items": "^1.19.2",
+    "@esri/arcgis-rest-portal": "^1.19.2",
     "@esri/arcgis-rest-request": "^1.19.2",
     "chalk": "^2.3.0",
     "commander": "^2.12.2",
diff --git a/demos/jsapi-integration/index.html b/demos/jsapi-integration/index.html
index 11bf2c8e86..87e040b51e 100644
--- a/demos/jsapi-integration/index.html
+++ b/demos/jsapi-integration/index.html
@@ -20,7 +20,7 @@
 
   <script src="node_modules/@esri/arcgis-rest-request/dist/umd/request.umd.js"></script>
   <script src="node_modules/@esri/arcgis-rest-auth/dist/umd/auth.umd.js"></script>
-  <script src="node_modules/@esri/arcgis-rest-items/dist/umd/items.umd.js"></script>
+  <script src="node_modules/@esri/arcgis-rest-portal/dist/umd/portal.umd.js"></script>
 
   <!--
     NOTE: rather than include the ArcGIS API for JavaScript via a <script> tag
diff --git a/demos/jsapi-integration/package.json b/demos/jsapi-integration/package.json
index fed8288194..03d930053c 100644
--- a/demos/jsapi-integration/package.json
+++ b/demos/jsapi-integration/package.json
@@ -7,7 +7,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@esri/arcgis-rest-auth": "^1.19.2",
-    "@esri/arcgis-rest-items": "^1.19.2",
+    "@esri/arcgis-rest-portal": "^1.19.2",
     "@esri/arcgis-rest-request": "^1.19.2"
   },
   "devDependencies": {
diff --git a/demos/node-cli-item-management/index.js b/demos/node-cli-item-management/index.js
index 91629b1942..73a0533219 100644
--- a/demos/node-cli-item-management/index.js
+++ b/demos/node-cli-item-management/index.js
@@ -3,7 +3,7 @@ require("isomorphic-form-data");
 const prompts = require("prompts");
 const chalk = require("chalk");
 const { UserSession } = require("@esri/arcgis-rest-auth");
-const { searchItems, removeItem } = require("@esri/arcgis-rest-items");
+const { searchItems, removeItem } = require("@esri/arcgis-rest-portal");
 
 // 1. Promt the user for sign in. Create a `UserSession`
 authenticate()
diff --git a/demos/node-cli-item-management/package.json b/demos/node-cli-item-management/package.json
index 80b7fbaaeb..be32ad502d 100644
--- a/demos/node-cli-item-management/package.json
+++ b/demos/node-cli-item-management/package.json
@@ -17,7 +17,7 @@
   ],
   "dependencies": {
     "@esri/arcgis-rest-auth": "^1.19.2",
-    "@esri/arcgis-rest-items": "^1.19.2",
+    "@esri/arcgis-rest-portal": "^1.19.2",
     "@esri/arcgis-rest-request": "^1.19.2",
     "chalk": "^2.3.0",
     "isomorphic-fetch": "^2.2.1",
diff --git a/demos/tree-shaking-rollup/package.json b/demos/tree-shaking-rollup/package.json
index 26a5b9f4f6..8cdd3497ef 100644
--- a/demos/tree-shaking-rollup/package.json
+++ b/demos/tree-shaking-rollup/package.json
@@ -19,7 +19,7 @@
     "rollup-plugin-node-resolve": "^4.0.1"
   },
   "dependencies": {
-    "@esri/arcgis-rest-items": "^1.19.2",
+    "@esri/arcgis-rest-portal": "^1.19.2",
     "@esri/arcgis-rest-request": "^1.19.2"
   }
 }
diff --git a/demos/tree-shaking-rollup/src/index.js b/demos/tree-shaking-rollup/src/index.js
index 390250c288..f42189f0fa 100644
--- a/demos/tree-shaking-rollup/src/index.js
+++ b/demos/tree-shaking-rollup/src/index.js
@@ -1,4 +1,4 @@
-import { searchItems } from "@esri/arcgis-rest-items";
+import { searchItems } from "@esri/arcgis-rest-portal";
 
 let element = document.createElement("div");
 document.body.appendChild(element);
diff --git a/demos/tree-shaking-webpack/package.json b/demos/tree-shaking-webpack/package.json
index 396429f5bf..7da156c581 100644
--- a/demos/tree-shaking-webpack/package.json
+++ b/demos/tree-shaking-webpack/package.json
@@ -18,7 +18,7 @@
     "webpack-cli": "^3.3.0"
   },
   "dependencies": {
-    "@esri/arcgis-rest-items": "^1.19.2",
+    "@esri/arcgis-rest-portal": "^1.19.2",
     "@esri/arcgis-rest-request": "^1.19.2"
   }
 }
diff --git a/demos/tree-shaking-webpack/src/index.js b/demos/tree-shaking-webpack/src/index.js
index 6221c43a02..ef5fa167fb 100644
--- a/demos/tree-shaking-webpack/src/index.js
+++ b/demos/tree-shaking-webpack/src/index.js
@@ -1,4 +1,4 @@
-import { searchItems } from "@esri/arcgis-rest-items";
+import { searchItems } from "@esri/arcgis-rest-portal";
 
 let element = document.createElement('div');
 document.body.appendChild(element);
diff --git a/demos/webmap-checker-sapper/package.json b/demos/webmap-checker-sapper/package.json
index ceb540b697..910a53338d 100644
--- a/demos/webmap-checker-sapper/package.json
+++ b/demos/webmap-checker-sapper/package.json
@@ -14,9 +14,8 @@
   },
   "dependencies": {
     "@esri/arcgis-rest-auth": "^1.19.2",
-    "@esri/arcgis-rest-items": "^1.19.2",
+    "@esri/arcgis-rest-portal": "^1.19.2",
     "@esri/arcgis-rest-request": "^1.19.2",
-    "@esri/arcgis-rest-users": "^1.19.2",
     "compression": "^1.7.1",
     "cookies": "^0.7.3",
     "dotenv": "^6.2.0",
diff --git a/demos/webmap-checker-sapper/src/routes/webmaps/[webmapId].html b/demos/webmap-checker-sapper/src/routes/webmaps/[webmapId].html
index bb7283ed07..6fe581c0ab 100644
--- a/demos/webmap-checker-sapper/src/routes/webmaps/[webmapId].html
+++ b/demos/webmap-checker-sapper/src/routes/webmaps/[webmapId].html
@@ -21,7 +21,7 @@ <h2>{item.title}</h2>
 
 <script>
   import { UserSession } from "@esri/arcgis-rest-auth";
-  import { getItem, getItemData } from "@esri/arcgis-rest-items";
+  import { getItem, getItemData } from "@esri/arcgis-rest-portal";
   import { retryWithNewSession } from "../../utils.js";
   import LayerStatus from "../../components/LayerStatus.html";
   import WebMap from "../../components/WebMap.html";
diff --git a/demos/webmap-checker-sapper/src/routes/webmaps/index.html b/demos/webmap-checker-sapper/src/routes/webmaps/index.html
index be07ba0942..5fa4694db5 100644
--- a/demos/webmap-checker-sapper/src/routes/webmaps/index.html
+++ b/demos/webmap-checker-sapper/src/routes/webmaps/index.html
@@ -10,7 +10,7 @@ <h1>Webmaps</h1>
 
 <script>
   import { UserSession } from "@esri/arcgis-rest-auth";
-  import { searchItems } from "@esri/arcgis-rest-items";
+  import { searchItems } from "@esri/arcgis-rest-portal";
   import { retryWithNewSession } from "../../utils.js";
 
   export default {
diff --git a/demos/webmap-checker-sapper/src/userInfoMiddleware.js b/demos/webmap-checker-sapper/src/userInfoMiddleware.js
index a9105205ce..e1ad458339 100644
--- a/demos/webmap-checker-sapper/src/userInfoMiddleware.js
+++ b/demos/webmap-checker-sapper/src/userInfoMiddleware.js
@@ -1,6 +1,6 @@
 import { getSelf } from "@esri/arcgis-rest-request";
 // we could use UserSession.getUser() instead
-import { getUser } from "@esri/arcgis-rest-users";
+import { getUser } from "@esri/arcgis-rest-portal";
 
 // this middleware checks for a session and if we find a session add
 // additional info to that session from the getUser and getSelf calls
diff --git a/packages/arcgis-rest-feature-service/package.json b/packages/arcgis-rest-feature-service/package.json
index c66e4e2b30..afc0e2b0ef 100644
--- a/packages/arcgis-rest-feature-service/package.json
+++ b/packages/arcgis-rest-feature-service/package.json
@@ -19,14 +19,14 @@
     "@esri/arcgis-rest-request": "^1.19.2",
     "@esri/arcgis-rest-common": "^1.19.2",
     "@esri/arcgis-rest-auth": "^1.19.2",
-    "@esri/arcgis-rest-items": "^1.19.2"
+    "@esri/arcgis-rest-portal": "^1.19.2"
 
   },
   "peerDependencies": {
     "@esri/arcgis-rest-request": "^1.19.2",
     "@esri/arcgis-rest-common": "^1.19.2",
     "@esri/arcgis-rest-auth": "^1.19.2",
-    "@esri/arcgis-rest-items": "^1.19.2"
+    "@esri/arcgis-rest-portal": "^1.19.2"
   },
   "scripts": {
     "prepare": "npm run build",
diff --git a/packages/arcgis-rest-feature-service/src/admin/createServiceDefinition.ts b/packages/arcgis-rest-feature-service/src/admin/createServiceDefinition.ts
index 920bd1aa22..5f2da7a6cf 100644
--- a/packages/arcgis-rest-feature-service/src/admin/createServiceDefinition.ts
+++ b/packages/arcgis-rest-feature-service/src/admin/createServiceDefinition.ts
@@ -6,7 +6,7 @@ import {
   moveItem,
   IItemCrudRequestOptions,
   determineOwner
-} from "@esri/arcgis-rest-items";
+} from "@esri/arcgis-rest-portal";
 import { IExtent, ISpatialReference } from "@esri/arcgis-rest-common";
 
 /**
diff --git a/packages/arcgis-rest-feature-service/test/mocks/move.ts b/packages/arcgis-rest-feature-service/test/mocks/move.ts
index 713565b39d..166b1f04bc 100644
--- a/packages/arcgis-rest-feature-service/test/mocks/move.ts
+++ b/packages/arcgis-rest-feature-service/test/mocks/move.ts
@@ -1,7 +1,7 @@
 /* Copyright (c) 2018 Environmental Systems Research Institute, Inc.
  * Apache-2.0 */
 
-import { IItemMoveResponse } from "@esri/arcgis-rest-items";
+import { IItemMoveResponse } from "@esri/arcgis-rest-portal";
 
 export const MoveToFolderResponse: IItemMoveResponse = {
   folder: "83216cba44bf4357bf06687ec88a847b",
diff --git a/packages/arcgis-rest-groups/README.md b/packages/arcgis-rest-groups/README.md
deleted file mode 100644
index 0d16e39d71..0000000000
--- a/packages/arcgis-rest-groups/README.md
+++ /dev/null
@@ -1,71 +0,0 @@
-[![npm version][npm-img]][npm-url]
-[![build status][travis-img]][travis-url]
-[![gzip bundle size][gzip-image]][npm-url]
-[![Coverage Status][coverage-img]][coverage-url]
-[![apache licensed](https://img.shields.io/badge/license-Apache-green.svg?style=flat-square)](https://raw.githubusercontent.com/Esri/arcgis-rest-js/master/LICENSE)
-
-[npm-img]: https://img.shields.io/npm/v/@esri/arcgis-rest-groups.svg?style=flat-square
-[npm-url]: https://www.npmjs.com/package/@esri/arcgis-rest-groups
-[travis-img]: https://img.shields.io/travis/Esri/arcgis-rest-js/master.svg?style=flat-square
-[travis-url]: https://travis-ci.org/Esri/arcgis-rest-js
-[gzip-image]: https://img.badgesize.io/https://unpkg.com/@esri/arcgis-rest-groups/dist/umd/groups.umd.min.js?compression=gzip
-[coverage-img]: https://codecov.io/gh/Esri/arcgis-rest-js/branch/master/graph/badge.svg
-[coverage-url]: https://codecov.io/gh/Esri/arcgis-rest-js
-
-# @esri/arcgis-rest-groups
-
-> A module for working with groups in the ArcGIS REST API that runs in Node.js and modern browsers.
-
-### Example
-
-```bash
-npm install @esri/arcgis-rest-request
-npm install @esri/arcgis-rest-groups
-```
-
-```js
-import { searchGroups } from '@esri/arcgis-rest-groups';
-
-searchGroups({q:"water"})
-    .then(response => {
-        console.log(response.results.length) // 10
-    });
-```
-
-### [API Reference](https://esri.github.io/arcgis-rest-js/api/groups/)
-
-### Issues
-
-If something isn't working the way you expected, please take a look at [previously logged issues](https://github.com/Esri/arcgis-rest-js/issues) first.  Have you found a new bug?  Want to request a new feature?  We'd [**love**](https://github.com/Esri/arcgis-rest-js/issues/new) to hear from you.
-
-If you're looking for help you can also post issues on [GIS Stackexchange](http://gis.stackexchange.com/questions/ask?tags=esri-oss).
-
-### Versioning
-
-For transparency into the release cycle and in striving to maintain backward compatibility, @esri/arcgis-rest-js is maintained under Semantic Versioning guidelines and will adhere to these rules whenever possible.
-
-For more information on SemVer, please visit <http://semver.org/>.
-
-### Contributing
-
-Esri welcomes contributions from anyone and everyone. Please see our [guidelines for contributing](CONTRIBUTING.md).
-
-### [Changelog](https://github.com/Esri/arcgis-rest-js/blob/master/CHANGELOG.md)
-
-### License
-
-Copyright &copy; 2017-2019 Esri
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-> http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-A copy of the license is available in the repository's [LICENSE](../../LICENSE) file.
\ No newline at end of file
diff --git a/packages/arcgis-rest-groups/package.json b/packages/arcgis-rest-groups/package.json
deleted file mode 100644
index 3b6978fa30..0000000000
--- a/packages/arcgis-rest-groups/package.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-  "name": "@esri/arcgis-rest-groups",
-  "version": "1.19.2",
-  "description": "Portal Group helpers for @esri/arcgis-rest-request",
-  "main": "dist/node/index.js",
-  "unpkg": "dist/umd/groups.umd.js",
-  "module": "dist/esm/index.js",
-  "js:next": "dist/esm/index.js",
-  "sideEffects": false,
-  "types": "dist/esm/index.d.ts",
-  "license": "Apache-2.0",
-  "files": [
-    "dist/**"
-  ],
-  "dependencies": {
-    "tslib": "^1.9.3"
-  },
-  "devDependencies": {
-    "@esri/arcgis-rest-auth": "^1.19.2",
-    "@esri/arcgis-rest-common": "^1.19.2",
-    "@esri/arcgis-rest-request": "^1.19.2"
-  },
-  "peerDependencies": {
-    "@esri/arcgis-rest-auth": "^1.19.2",
-    "@esri/arcgis-rest-common": "^1.19.2",
-    "@esri/arcgis-rest-request": "^1.19.2"
-  },
-  "scripts": {
-    "prepare": "npm run build",
-    "build": "npm run build:node && npm run build:umd && npm run build:esm",
-    "build:esm": "tsc --module es2015 --outDir ./dist/esm --declaration",
-    "build:umd": "rollup -c ../../umd-base-profile.js && rollup -c ../../umd-production-profile.js",
-    "build:node": "tsc --module commonjs --outDir ./dist/node",
-    "dev:esm": "tsc -w --module es2015 --outDir ./dist/esm --declaration",
-    "dev:umd": "rollup -w -c ../../umd-base-profile.js",
-    "dev:node": "tsc -w --module commonjs --outDir ./dist/node"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Esri/arcgis-rest-js.git"
-  },
-  "contributors": [
-    {
-      "name": "Dave Bouwman",
-      "email": "dbouwman@esri.com",
-      "url": "http://blog.davebouwman.com/"
-    }
-  ],
-  "bugs": {
-    "url": "https://github.com/Esri/arcgis-rest-js/issues"
-  },
-  "homepage": "https://github.com/Esri/arcgis-rest-js#readme",
-  "keywords": [
-    "typescript",
-    "promise",
-    "fetch",
-    "arcgis",
-    "esri",
-    "ES6"
-  ]
-}
diff --git a/packages/arcgis-rest-groups/src/index.ts b/packages/arcgis-rest-groups/src/index.ts
deleted file mode 100644
index 1b33f819e9..0000000000
--- a/packages/arcgis-rest-groups/src/index.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/* Copyright (c) 2018 Environmental Systems Research Institute, Inc.
- * Apache-2.0 */
-
-export * from "./create";
-export * from "./get";
-export * from "./helpers";
-export * from "./notification";
-export * from "./protect";
-export * from "./remove";
-export * from "./search";
-export * from "./update";
-export * from "./join";
diff --git a/packages/arcgis-rest-items/package-lock.json b/packages/arcgis-rest-items/package-lock.json
deleted file mode 100644
index 8714b9aab7..0000000000
--- a/packages/arcgis-rest-items/package-lock.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"requires": true,
-	"lockfileVersion": 1,
-	"dependencies": {
-		"tslib": {
-			"version": "1.9.3",
-			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
-			"integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
-		}
-	}
-}
diff --git a/packages/arcgis-rest-items/src/index.ts b/packages/arcgis-rest-items/src/index.ts
deleted file mode 100644
index a55f011762..0000000000
--- a/packages/arcgis-rest-items/src/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* Copyright (c) 2018 Environmental Systems Research Institute, Inc.
- * Apache-2.0 */
-
-export * from "./add";
-export * from "./create";
-export * from "./get";
-export * from "./protect";
-export * from "./remove";
-export * from "./search";
-export * from "./update";
-export * from "./helpers";
diff --git a/packages/arcgis-rest-items/tsconfig.json b/packages/arcgis-rest-items/tsconfig.json
deleted file mode 100644
index 400168ea91..0000000000
--- a/packages/arcgis-rest-items/tsconfig.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "include": [
-      "src/**/*.ts"
-  ]
-}
\ No newline at end of file
diff --git a/packages/arcgis-rest-items/README.md b/packages/arcgis-rest-portal/README.md
similarity index 82%
rename from packages/arcgis-rest-items/README.md
rename to packages/arcgis-rest-portal/README.md
index 510ed258ba..88c6b657b1 100644
--- a/packages/arcgis-rest-items/README.md
+++ b/packages/arcgis-rest-portal/README.md
@@ -4,27 +4,27 @@
 [![Coverage Status][coverage-img]][coverage-url]
 [![apache licensed](https://img.shields.io/badge/license-Apache-green.svg?style=flat-square)](https://raw.githubusercontent.com/Esri/arcgis-rest-js/master/LICENSE)
 
-[npm-img]: https://img.shields.io/npm/v/@esri/arcgis-rest-items.svg?style=flat-square
-[npm-url]: https://www.npmjs.com/package/@esri/arcgis-rest-items
+[npm-img]: https://img.shields.io/npm/v/@esri/arcgis-rest-portal.svg?style=flat-square
+[npm-url]: https://www.npmjs.com/package/@esri/arcgis-rest-portal
 [travis-img]: https://img.shields.io/travis/Esri/arcgis-rest-js/master.svg?style=flat-square
 [travis-url]: https://travis-ci.org/Esri/arcgis-rest-js
-[gzip-image]: https://img.badgesize.io/https://unpkg.com/@esri/arcgis-rest-items/dist/umd/items.umd.min.js?compression=gzip
+[gzip-image]: https://img.badgesize.io/https://unpkg.com/@esri/arcgis-rest-portal/dist/umd/items.umd.min.js?compression=gzip
 [coverage-img]: https://codecov.io/gh/Esri/arcgis-rest-js/branch/master/graph/badge.svg
 [coverage-url]: https://codecov.io/gh/Esri/arcgis-rest-js
 
-# @esri/arcgis-rest-items
+# @esri/arcgis-rest-portal
 
-> A module for working with content in the ArcGIS REST API that runs in Node.js and modern browsers.
+> A module for working with ArcGIS Online and Enterprise content via the REST API that runs in Node.js and modern browsers.
 
 ### Example
 
 ```bash
 npm install @esri/arcgis-rest-request
-npm install @esri/arcgis-rest-items
+npm install @esri/arcgis-rest-portal
 ```
 
 ```js
-import { getItem } from '@esri/arcgis-rest-items';
+import { getItem } from '@esri/arcgis-rest-portal';
 
 const itemId = "30e5fe3149c34df1ba922e6f5bbf808f";
 
@@ -34,7 +34,7 @@ getItem(itemId)
     });
 ```
 
-### [API Reference](https://esri.github.io/arcgis-rest-js/api/items/)
+### [API Reference](https://esri.github.io/arcgis-rest-js/api/portal/)
 
 ### Issues
 
diff --git a/packages/arcgis-rest-groups/package-lock.json b/packages/arcgis-rest-portal/package-lock.json
similarity index 100%
rename from packages/arcgis-rest-groups/package-lock.json
rename to packages/arcgis-rest-portal/package-lock.json
diff --git a/packages/arcgis-rest-items/package.json b/packages/arcgis-rest-portal/package.json
similarity index 92%
rename from packages/arcgis-rest-items/package.json
rename to packages/arcgis-rest-portal/package.json
index 3a0ea2cbc7..21b2880ff1 100644
--- a/packages/arcgis-rest-items/package.json
+++ b/packages/arcgis-rest-portal/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "@esri/arcgis-rest-items",
+  "name": "@esri/arcgis-rest-portal",
   "version": "1.19.2",
-  "description": "Portal Item helpers for @esri/arcgis-rest-request",
+  "description": "ArcGIS Online and Enterprise content and user helpers for @esri/arcgis-rest-request",
   "main": "dist/node/index.js",
   "unpkg": "dist/umd/items.umd.js",
   "module": "dist/esm/index.js",
diff --git a/packages/arcgis-rest-groups/src/create.ts b/packages/arcgis-rest-portal/src/groups/create.ts
similarity index 100%
rename from packages/arcgis-rest-groups/src/create.ts
rename to packages/arcgis-rest-portal/src/groups/create.ts
diff --git a/packages/arcgis-rest-groups/src/get.ts b/packages/arcgis-rest-portal/src/groups/get.ts
similarity index 100%
rename from packages/arcgis-rest-groups/src/get.ts
rename to packages/arcgis-rest-portal/src/groups/get.ts
diff --git a/packages/arcgis-rest-groups/src/helpers.ts b/packages/arcgis-rest-portal/src/groups/helpers.ts
similarity index 100%
rename from packages/arcgis-rest-groups/src/helpers.ts
rename to packages/arcgis-rest-portal/src/groups/helpers.ts
diff --git a/packages/arcgis-rest-groups/src/join.ts b/packages/arcgis-rest-portal/src/groups/join.ts
similarity index 100%
rename from packages/arcgis-rest-groups/src/join.ts
rename to packages/arcgis-rest-portal/src/groups/join.ts
diff --git a/packages/arcgis-rest-groups/src/notification.ts b/packages/arcgis-rest-portal/src/groups/notification.ts
similarity index 100%
rename from packages/arcgis-rest-groups/src/notification.ts
rename to packages/arcgis-rest-portal/src/groups/notification.ts
diff --git a/packages/arcgis-rest-groups/src/protect.ts b/packages/arcgis-rest-portal/src/groups/protect.ts
similarity index 100%
rename from packages/arcgis-rest-groups/src/protect.ts
rename to packages/arcgis-rest-portal/src/groups/protect.ts
diff --git a/packages/arcgis-rest-groups/src/remove.ts b/packages/arcgis-rest-portal/src/groups/remove.ts
similarity index 100%
rename from packages/arcgis-rest-groups/src/remove.ts
rename to packages/arcgis-rest-portal/src/groups/remove.ts
diff --git a/packages/arcgis-rest-groups/src/search.ts b/packages/arcgis-rest-portal/src/groups/search.ts
similarity index 100%
rename from packages/arcgis-rest-groups/src/search.ts
rename to packages/arcgis-rest-portal/src/groups/search.ts
diff --git a/packages/arcgis-rest-groups/src/update.ts b/packages/arcgis-rest-portal/src/groups/update.ts
similarity index 100%
rename from packages/arcgis-rest-groups/src/update.ts
rename to packages/arcgis-rest-portal/src/groups/update.ts
diff --git a/packages/arcgis-rest-portal/src/index.ts b/packages/arcgis-rest-portal/src/index.ts
new file mode 100644
index 0000000000..ac29b4bf5c
--- /dev/null
+++ b/packages/arcgis-rest-portal/src/index.ts
@@ -0,0 +1,30 @@
+/* Copyright (c) 2018-2019 Environmental Systems Research Institute, Inc.
+ * Apache-2.0 */
+
+export * from "./items/add";
+export * from "./items/create";
+export * from "./items/get";
+export * from "./items/protect";
+export * from "./items/remove";
+export * from "./items/search";
+export * from "./items/update";
+export * from "./items/helpers";
+
+export * from "./groups/create";
+export * from "./groups/get";
+export * from "./groups/helpers";
+export * from "./groups/notification";
+export * from "./groups/protect";
+export * from "./groups/remove";
+export * from "./groups/search";
+export * from "./groups/update";
+export * from "./groups/join";
+
+export * from "./users/get";
+export * from "./users/invitation";
+export * from "./users/notification";
+export * from "./users/update";
+
+export * from "./sharing/access";
+export * from "./sharing/group-sharing";
+export * from "./sharing/helpers";
diff --git a/packages/arcgis-rest-items/src/add.ts b/packages/arcgis-rest-portal/src/items/add.ts
similarity index 100%
rename from packages/arcgis-rest-items/src/add.ts
rename to packages/arcgis-rest-portal/src/items/add.ts
diff --git a/packages/arcgis-rest-items/src/create.ts b/packages/arcgis-rest-portal/src/items/create.ts
similarity index 100%
rename from packages/arcgis-rest-items/src/create.ts
rename to packages/arcgis-rest-portal/src/items/create.ts
diff --git a/packages/arcgis-rest-items/src/get.ts b/packages/arcgis-rest-portal/src/items/get.ts
similarity index 100%
rename from packages/arcgis-rest-items/src/get.ts
rename to packages/arcgis-rest-portal/src/items/get.ts
diff --git a/packages/arcgis-rest-items/src/helpers.ts b/packages/arcgis-rest-portal/src/items/helpers.ts
similarity index 100%
rename from packages/arcgis-rest-items/src/helpers.ts
rename to packages/arcgis-rest-portal/src/items/helpers.ts
diff --git a/packages/arcgis-rest-items/src/protect.ts b/packages/arcgis-rest-portal/src/items/protect.ts
similarity index 100%
rename from packages/arcgis-rest-items/src/protect.ts
rename to packages/arcgis-rest-portal/src/items/protect.ts
diff --git a/packages/arcgis-rest-items/src/remove.ts b/packages/arcgis-rest-portal/src/items/remove.ts
similarity index 92%
rename from packages/arcgis-rest-items/src/remove.ts
rename to packages/arcgis-rest-portal/src/items/remove.ts
index ae69e0b111..edbd5ebeb6 100644
--- a/packages/arcgis-rest-items/src/remove.ts
+++ b/packages/arcgis-rest-portal/src/items/remove.ts
@@ -1,7 +1,11 @@
 /* Copyright (c) 2018 Environmental Systems Research Institute, Inc.
  * Apache-2.0 */
 
-import { request, getPortalUrl, appendCustomParams } from "@esri/arcgis-rest-request";
+import {
+  request,
+  getPortalUrl,
+  appendCustomParams
+} from "@esri/arcgis-rest-request";
 
 import {
   IItemIdRequestOptions,
@@ -54,11 +58,13 @@ export function removeItem(
  */
 export function removeItemRelationship(
   requestOptions: IManageItemRelationshipRequestOptions
-): Promise<{ "success": boolean }> {
+): Promise<{ success: boolean }> {
   const owner = determineOwner(requestOptions);
-  const url = `${getPortalUrl(requestOptions)}/content/users/${owner}/removeRelationship`;
+  const url = `${getPortalUrl(
+    requestOptions
+  )}/content/users/${owner}/removeRelationship`;
 
-  const options = { params: {}, ...requestOptions }
+  const options = { params: {}, ...requestOptions };
   appendCustomParams(requestOptions, options);
 
   return request(url, options);
diff --git a/packages/arcgis-rest-items/src/search.ts b/packages/arcgis-rest-portal/src/items/search.ts
similarity index 100%
rename from packages/arcgis-rest-items/src/search.ts
rename to packages/arcgis-rest-portal/src/items/search.ts
diff --git a/packages/arcgis-rest-items/src/update.ts b/packages/arcgis-rest-portal/src/items/update.ts
similarity index 100%
rename from packages/arcgis-rest-items/src/update.ts
rename to packages/arcgis-rest-portal/src/items/update.ts
diff --git a/packages/arcgis-rest-sharing/src/access.ts b/packages/arcgis-rest-portal/src/sharing/access.ts
similarity index 100%
rename from packages/arcgis-rest-sharing/src/access.ts
rename to packages/arcgis-rest-portal/src/sharing/access.ts
diff --git a/packages/arcgis-rest-sharing/src/group-sharing.ts b/packages/arcgis-rest-portal/src/sharing/group-sharing.ts
similarity index 98%
rename from packages/arcgis-rest-sharing/src/group-sharing.ts
rename to packages/arcgis-rest-portal/src/sharing/group-sharing.ts
index 0b4bfe8161..3c3e17249e 100644
--- a/packages/arcgis-rest-sharing/src/group-sharing.ts
+++ b/packages/arcgis-rest-portal/src/sharing/group-sharing.ts
@@ -26,7 +26,7 @@ interface IGroupSharingUnsharingRequestOptions
 
 /**
  * ```js
- * import { shareItemWithGroup } from '@esri/arcgis-rest-sharing';
+ * import { shareItemWithGroup } from '@esri/arcgis-rest-portal';
  * //
  * shareItemWithGroup({
  *   id: "abc123",
@@ -49,7 +49,7 @@ export function shareItemWithGroup(
  * Stop sharing an item with a group, either as an [item owner](https://developers.arcgis.com/rest/users-groups-and-items/unshare-item-as-item-owner-.htm), [group admin]((https://developers.arcgis.com/rest/users-groups-and-items/unshare-item-as-group-admin-.htm)) or organization admin.
  *
  * ```js
- * import { unshareItemWithGroup } from '@esri/arcgis-rest-sharing';
+ * import { unshareItemWithGroup } from '@esri/arcgis-rest-portal';
  *
  * unshareItemWithGroup({
  *   id: "abc123",
diff --git a/packages/arcgis-rest-sharing/src/helpers.ts b/packages/arcgis-rest-portal/src/sharing/helpers.ts
similarity index 97%
rename from packages/arcgis-rest-sharing/src/helpers.ts
rename to packages/arcgis-rest-portal/src/sharing/helpers.ts
index cb579bcb71..3e3a14d810 100644
--- a/packages/arcgis-rest-sharing/src/helpers.ts
+++ b/packages/arcgis-rest-portal/src/sharing/helpers.ts
@@ -4,7 +4,7 @@
 import { IRequestOptions, getPortalUrl } from "@esri/arcgis-rest-request";
 import { UserSession } from "@esri/arcgis-rest-auth";
 import { IGroup, IUser, GroupMembership } from "@esri/arcgis-rest-common";
-import { getGroup } from "@esri/arcgis-rest-groups";
+import { getGroup } from "../groups/get";
 import { IGroupSharingRequestOptions } from "./group-sharing";
 
 export interface ISharingRequestOptions extends IRequestOptions {
diff --git a/packages/arcgis-rest-users/src/get.ts b/packages/arcgis-rest-portal/src/users/get.ts
similarity index 100%
rename from packages/arcgis-rest-users/src/get.ts
rename to packages/arcgis-rest-portal/src/users/get.ts
diff --git a/packages/arcgis-rest-users/src/invitation.ts b/packages/arcgis-rest-portal/src/users/invitation.ts
similarity index 100%
rename from packages/arcgis-rest-users/src/invitation.ts
rename to packages/arcgis-rest-portal/src/users/invitation.ts
diff --git a/packages/arcgis-rest-users/src/notification.ts b/packages/arcgis-rest-portal/src/users/notification.ts
similarity index 100%
rename from packages/arcgis-rest-users/src/notification.ts
rename to packages/arcgis-rest-portal/src/users/notification.ts
diff --git a/packages/arcgis-rest-users/src/update.ts b/packages/arcgis-rest-portal/src/users/update.ts
similarity index 100%
rename from packages/arcgis-rest-users/src/update.ts
rename to packages/arcgis-rest-portal/src/users/update.ts
diff --git a/packages/arcgis-rest-groups/test/crud.test.ts b/packages/arcgis-rest-portal/test/groups/crud.test.ts
similarity index 96%
rename from packages/arcgis-rest-groups/test/crud.test.ts
rename to packages/arcgis-rest-portal/test/groups/crud.test.ts
index 97be750ac2..7edf398c0c 100644
--- a/packages/arcgis-rest-groups/test/crud.test.ts
+++ b/packages/arcgis-rest-portal/test/groups/crud.test.ts
@@ -1,11 +1,11 @@
 /* Copyright (c) 2018 Environmental Systems Research Institute, Inc.
  * Apache-2.0 */
 
-import { createGroup } from "../src/create";
-import { updateGroup } from "../src/update";
-import { removeGroup } from "../src/remove";
+import { createGroup } from "../../src/groups/create";
+import { updateGroup } from "../../src/groups/update";
+import { removeGroup } from "../../src/groups/remove";
 
-import { GroupEditResponse } from "./mocks/responses";
+import { GroupEditResponse } from "../mocks/groups/responses";
 
 import { encodeParam } from "@esri/arcgis-rest-request";
 import { UserSession } from "@esri/arcgis-rest-auth";
diff --git a/packages/arcgis-rest-groups/test/get.test.ts b/packages/arcgis-rest-portal/test/groups/get.test.ts
similarity index 96%
rename from packages/arcgis-rest-groups/test/get.test.ts
rename to packages/arcgis-rest-portal/test/groups/get.test.ts
index 5a508daa77..51568fd570 100644
--- a/packages/arcgis-rest-groups/test/get.test.ts
+++ b/packages/arcgis-rest-portal/test/groups/get.test.ts
@@ -1,13 +1,13 @@
 /* Copyright (c) 2018 Environmental Systems Research Institute, Inc.
  * Apache-2.0 */
 
-import { getGroup, getGroupContent, getGroupUsers } from "../src/get";
+import { getGroup, getGroupContent, getGroupUsers } from "../../src/groups/get";
 
 import {
   GroupResponse,
   GroupContentResponse,
   GroupUsersResponse
-} from "./mocks/responses";
+} from "../mocks/groups/responses";
 
 import * as fetchMock from "fetch-mock";
 
diff --git a/packages/arcgis-rest-groups/test/join.test.ts b/packages/arcgis-rest-portal/test/groups/join.test.ts
similarity index 94%
rename from packages/arcgis-rest-groups/test/join.test.ts
rename to packages/arcgis-rest-portal/test/groups/join.test.ts
index 4f57d2216f..006517bdf8 100644
--- a/packages/arcgis-rest-groups/test/join.test.ts
+++ b/packages/arcgis-rest-portal/test/groups/join.test.ts
@@ -1,9 +1,9 @@
 /* Copyright (c) 2018 Environmental Systems Research Institute, Inc.
  * Apache-2.0 */
 
-import { joinGroup, leaveGroup } from "../src/join";
+import { joinGroup, leaveGroup } from "../../src/groups/join";
 
-import { GroupEditResponse } from "./mocks/responses";
+import { GroupEditResponse } from "../mocks/groups/responses";
 
 import { encodeParam } from "@esri/arcgis-rest-request";
 import { UserSession } from "@esri/arcgis-rest-auth";
diff --git a/packages/arcgis-rest-groups/test/notification.test.ts b/packages/arcgis-rest-portal/test/groups/notification.test.ts
similarity index 96%
rename from packages/arcgis-rest-groups/test/notification.test.ts
rename to packages/arcgis-rest-portal/test/groups/notification.test.ts
index 107685dfcb..30ae8db09a 100644
--- a/packages/arcgis-rest-groups/test/notification.test.ts
+++ b/packages/arcgis-rest-portal/test/groups/notification.test.ts
@@ -4,9 +4,9 @@ import { TOMORROW } from "@esri/arcgis-rest-auth/test/utils";
 
 import * as fetchMock from "fetch-mock";
 
-import { createGroupNotification } from "../src/notification";
+import { createGroupNotification } from "../../src/groups/notification";
 
-import { GroupNotificationResponse } from "./mocks/responses";
+import { GroupNotificationResponse } from "../mocks/groups/responses";
 
 describe("groups", () => {
   afterEach(fetchMock.restore);
diff --git a/packages/arcgis-rest-groups/test/protect.test.ts b/packages/arcgis-rest-portal/test/groups/protect.test.ts
similarity index 94%
rename from packages/arcgis-rest-groups/test/protect.test.ts
rename to packages/arcgis-rest-portal/test/groups/protect.test.ts
index c01bc8ca48..511c04bc7d 100644
--- a/packages/arcgis-rest-groups/test/protect.test.ts
+++ b/packages/arcgis-rest-portal/test/groups/protect.test.ts
@@ -1,9 +1,9 @@
 /* Copyright (c) 2018 Environmental Systems Research Institute, Inc.
  * Apache-2.0 */
 
-import { protectGroup, unprotectGroup } from "../src/protect";
+import { protectGroup, unprotectGroup } from "../../src/groups/protect";
 
-import { GroupEditResponse } from "./mocks/responses";
+import { GroupEditResponse } from "../mocks/groups/responses";
 
 import { encodeParam } from "@esri/arcgis-rest-request";
 import { UserSession } from "@esri/arcgis-rest-auth";
diff --git a/packages/arcgis-rest-groups/test/search.test.ts b/packages/arcgis-rest-portal/test/groups/search.test.ts
similarity index 95%
rename from packages/arcgis-rest-groups/test/search.test.ts
rename to packages/arcgis-rest-portal/test/groups/search.test.ts
index ab8ac40eeb..9dbb4074a8 100644
--- a/packages/arcgis-rest-groups/test/search.test.ts
+++ b/packages/arcgis-rest-portal/test/groups/search.test.ts
@@ -1,9 +1,9 @@
 /* Copyright (c) 2018 Environmental Systems Research Institute, Inc.
  * Apache-2.0 */
 
-import { searchGroups } from "../src/search";
+import { searchGroups } from "../../src/groups/search";
 
-import { GroupSearchResponse } from "./mocks/responses";
+import { GroupSearchResponse } from "../mocks/groups/responses";
 
 import * as fetchMock from "fetch-mock";
 
diff --git a/packages/arcgis-rest-items/test/add.test.ts b/packages/arcgis-rest-portal/test/items/add.test.ts
similarity index 98%
rename from packages/arcgis-rest-items/test/add.test.ts
rename to packages/arcgis-rest-portal/test/items/add.test.ts
index 82aa780591..51aa547e6e 100644
--- a/packages/arcgis-rest-items/test/add.test.ts
+++ b/packages/arcgis-rest-portal/test/items/add.test.ts
@@ -3,16 +3,16 @@
 
 import * as fetchMock from "fetch-mock";
 
-import { attachmentFile } from "../../arcgis-rest-feature-service/test/attachments.test";
+import { attachmentFile } from "../../../arcgis-rest-feature-service/test/attachments.test";
 
 import {
   addItemJsonData,
   addItemData,
   addItemResource,
   addItemRelationship
-} from "../src/add";
+} from "../../src/items/add";
 
-import { ItemSuccessResponse } from "./mocks/item";
+import { ItemSuccessResponse } from "../mocks/items/item";
 
 import { UserSession } from "@esri/arcgis-rest-auth";
 import { TOMORROW } from "@esri/arcgis-rest-auth/test/utils";
diff --git a/packages/arcgis-rest-items/test/create.test.ts b/packages/arcgis-rest-portal/test/items/create.test.ts
similarity index 98%
rename from packages/arcgis-rest-items/test/create.test.ts
rename to packages/arcgis-rest-portal/test/items/create.test.ts
index e057e16236..0ba67d5352 100644
--- a/packages/arcgis-rest-items/test/create.test.ts
+++ b/packages/arcgis-rest-portal/test/items/create.test.ts
@@ -3,9 +3,13 @@
 
 import * as fetchMock from "fetch-mock";
 
-import { createFolder, createItem, createItemInFolder } from "../src/create";
+import {
+  createFolder,
+  createItem,
+  createItemInFolder
+} from "../../src/items/create";
 
-import { ItemSuccessResponse } from "./mocks/item";
+import { ItemSuccessResponse } from "../mocks/items/item";
 
 import { UserSession } from "@esri/arcgis-rest-auth";
 import { TOMORROW } from "@esri/arcgis-rest-auth/test/utils";
diff --git a/packages/arcgis-rest-items/test/get.test.ts b/packages/arcgis-rest-portal/test/items/get.test.ts
similarity index 98%
rename from packages/arcgis-rest-items/test/get.test.ts
rename to packages/arcgis-rest-portal/test/items/get.test.ts
index 3127457206..4c6f776751 100644
--- a/packages/arcgis-rest-items/test/get.test.ts
+++ b/packages/arcgis-rest-portal/test/items/get.test.ts
@@ -9,16 +9,16 @@ import {
   getItemResources,
   getItemGroups,
   getRelatedItems
-} from "../src/get";
+} from "../../src/items/get";
 
 import {
   ItemResponse,
   ItemDataResponse,
   ItemGroupResponse,
   RelatedItemsResponse
-} from "./mocks/item";
+} from "../mocks/items/item";
 
-import { GetItemResourcesResponse } from "./mocks/resources";
+import { GetItemResourcesResponse } from "../mocks/items/resources";
 
 import { UserSession } from "@esri/arcgis-rest-auth";
 import { TOMORROW } from "@esri/arcgis-rest-auth/test/utils";
diff --git a/packages/arcgis-rest-items/test/protect.test.ts b/packages/arcgis-rest-portal/test/items/protect.test.ts
similarity index 96%
rename from packages/arcgis-rest-items/test/protect.test.ts
rename to packages/arcgis-rest-portal/test/items/protect.test.ts
index 3c3b5569a0..f7a7bd6ea7 100644
--- a/packages/arcgis-rest-items/test/protect.test.ts
+++ b/packages/arcgis-rest-portal/test/items/protect.test.ts
@@ -3,9 +3,9 @@
 
 import * as fetchMock from "fetch-mock";
 
-import { protectItem, unprotectItem } from "../src/protect";
+import { protectItem, unprotectItem } from "../../src/items/protect";
 
-import { ItemSuccessResponse } from "./mocks/item";
+import { ItemSuccessResponse } from "../mocks/items/item";
 
 import { UserSession } from "@esri/arcgis-rest-auth";
 import { TOMORROW } from "@esri/arcgis-rest-auth/test/utils";
diff --git a/packages/arcgis-rest-items/test/remove.test.ts b/packages/arcgis-rest-portal/test/items/remove.test.ts
similarity index 97%
rename from packages/arcgis-rest-items/test/remove.test.ts
rename to packages/arcgis-rest-portal/test/items/remove.test.ts
index 1a21303fe7..583ac3bd3d 100644
--- a/packages/arcgis-rest-items/test/remove.test.ts
+++ b/packages/arcgis-rest-portal/test/items/remove.test.ts
@@ -8,11 +8,11 @@ import {
   removeItem,
   removeItemResource,
   removeItemRelationship
-} from "../src/remove";
+} from "../../src/items/remove";
 
-import { ItemSuccessResponse } from "./mocks/item";
+import { ItemSuccessResponse } from "../mocks/items/item";
 
-import { RemoveItemResourceResponse } from "./mocks/resources";
+import { RemoveItemResourceResponse } from "../mocks/items/resources";
 
 import { UserSession } from "@esri/arcgis-rest-auth";
 import { TOMORROW } from "@esri/arcgis-rest-auth/test/utils";
diff --git a/packages/arcgis-rest-items/test/search.test.ts b/packages/arcgis-rest-portal/test/items/search.test.ts
similarity index 97%
rename from packages/arcgis-rest-items/test/search.test.ts
rename to packages/arcgis-rest-portal/test/items/search.test.ts
index 5f94e6856c..bb0e091f46 100644
--- a/packages/arcgis-rest-items/test/search.test.ts
+++ b/packages/arcgis-rest-portal/test/items/search.test.ts
@@ -3,9 +3,9 @@
 
 import * as fetchMock from "fetch-mock";
 
-import { searchItems, ISearchRequestOptions } from "../src/search";
+import { searchItems, ISearchRequestOptions } from "../../src/items/search";
 
-import { SearchResponse } from "./mocks/search";
+import { SearchResponse } from "../mocks/items/search";
 import { UserSession } from "@esri/arcgis-rest-auth";
 import { TOMORROW } from "@esri/arcgis-rest-auth/test/utils";
 
diff --git a/packages/arcgis-rest-items/test/update.test.ts b/packages/arcgis-rest-portal/test/items/update.test.ts
similarity index 98%
rename from packages/arcgis-rest-items/test/update.test.ts
rename to packages/arcgis-rest-portal/test/items/update.test.ts
index ba39791402..ef7c986a50 100644
--- a/packages/arcgis-rest-items/test/update.test.ts
+++ b/packages/arcgis-rest-portal/test/items/update.test.ts
@@ -3,13 +3,17 @@
 
 import * as fetchMock from "fetch-mock";
 
-import { attachmentFile } from "../../arcgis-rest-feature-service/test/attachments.test";
+import { attachmentFile } from "../../../arcgis-rest-feature-service/test/attachments.test";
 
-import { updateItem, updateItemResource, moveItem } from "../src/update";
+import {
+  updateItem,
+  updateItemResource,
+  moveItem
+} from "../../src/items/update";
 
-import { ItemSuccessResponse } from "./mocks/item";
+import { ItemSuccessResponse } from "../mocks/items/item";
 
-import { UpdateItemResourceResponse } from "./mocks/resources";
+import { UpdateItemResourceResponse } from "../mocks/items/resources";
 
 import { UserSession } from "@esri/arcgis-rest-auth";
 import { TOMORROW } from "@esri/arcgis-rest-auth/test/utils";
diff --git a/packages/arcgis-rest-groups/test/mocks/responses.ts b/packages/arcgis-rest-portal/test/mocks/groups/responses.ts
similarity index 95%
rename from packages/arcgis-rest-groups/test/mocks/responses.ts
rename to packages/arcgis-rest-portal/test/mocks/groups/responses.ts
index ad971ec5e4..f34659f879 100644
--- a/packages/arcgis-rest-groups/test/mocks/responses.ts
+++ b/packages/arcgis-rest-portal/test/mocks/groups/responses.ts
@@ -1,8 +1,11 @@
 /* Copyright (c) 2018 Environmental Systems Research Institute, Inc.
  * Apache-2.0 */
 
-import { IGroupSearchResult } from "../../src/search";
-import { IGroupContentResult, IGroupUsersResult } from "../../src/get";
+import { IGroupSearchResult } from "../../../src/groups/search";
+import {
+  IGroupContentResult,
+  IGroupUsersResult
+} from "../../../src/groups/get";
 
 import { IGroup } from "@esri/arcgis-rest-common";
 
diff --git a/packages/arcgis-rest-items/test/mocks/foo.zip b/packages/arcgis-rest-portal/test/mocks/items/foo.zip
similarity index 100%
rename from packages/arcgis-rest-items/test/mocks/foo.zip
rename to packages/arcgis-rest-portal/test/mocks/items/foo.zip
diff --git a/packages/arcgis-rest-items/test/mocks/item.ts b/packages/arcgis-rest-portal/test/mocks/items/item.ts
similarity index 96%
rename from packages/arcgis-rest-items/test/mocks/item.ts
rename to packages/arcgis-rest-portal/test/mocks/items/item.ts
index 4ad119ce26..a71fcd6c39 100644
--- a/packages/arcgis-rest-items/test/mocks/item.ts
+++ b/packages/arcgis-rest-portal/test/mocks/items/item.ts
@@ -2,7 +2,10 @@
  * Apache-2.0 */
 
 import { IItem } from "@esri/arcgis-rest-common";
-import { IGetRelatedItemsResponse, IItemGroupResponse } from "../../src/get";
+import {
+  IGetRelatedItemsResponse,
+  IItemGroupResponse
+} from "../../../src/items/get";
 
 export const ItemSuccessResponse: any = {
   success: true,
diff --git a/packages/arcgis-rest-items/test/mocks/resources.ts b/packages/arcgis-rest-portal/test/mocks/items/resources.ts
similarity index 100%
rename from packages/arcgis-rest-items/test/mocks/resources.ts
rename to packages/arcgis-rest-portal/test/mocks/items/resources.ts
diff --git a/packages/arcgis-rest-items/test/mocks/search.ts b/packages/arcgis-rest-portal/test/mocks/items/search.ts
similarity index 96%
rename from packages/arcgis-rest-items/test/mocks/search.ts
rename to packages/arcgis-rest-portal/test/mocks/items/search.ts
index 5b20a892b9..9d9571bf24 100644
--- a/packages/arcgis-rest-items/test/mocks/search.ts
+++ b/packages/arcgis-rest-portal/test/mocks/items/search.ts
@@ -1,7 +1,7 @@
 /* Copyright (c) 2018 Environmental Systems Research Institute, Inc.
  * Apache-2.0 */
 
-import { ISearchResult } from "../../src/search";
+import { ISearchResult } from "../../../src/items/search";
 
 export const SearchResponse: ISearchResult = {
   query: "",
diff --git a/packages/arcgis-rest-sharing/test/mocks/sharing.ts b/packages/arcgis-rest-portal/test/mocks/sharing/sharing.ts
similarity index 100%
rename from packages/arcgis-rest-sharing/test/mocks/sharing.ts
rename to packages/arcgis-rest-portal/test/mocks/sharing/sharing.ts
diff --git a/packages/arcgis-rest-users/test/mocks/invitation.ts b/packages/arcgis-rest-portal/test/mocks/users/invitation.ts
similarity index 95%
rename from packages/arcgis-rest-users/test/mocks/invitation.ts
rename to packages/arcgis-rest-portal/test/mocks/users/invitation.ts
index 746f004e5f..af64de877c 100644
--- a/packages/arcgis-rest-users/test/mocks/invitation.ts
+++ b/packages/arcgis-rest-portal/test/mocks/users/invitation.ts
@@ -1,4 +1,4 @@
-import { IInvitation, IInvitationResult } from "../../src/invitation";
+import { IInvitation, IInvitationResult } from "../../../src/users/invitation";
 
 export const UserInvitationsResponse: IInvitationResult = {
   userInvitations: [
diff --git a/packages/arcgis-rest-users/test/mocks/notification.ts b/packages/arcgis-rest-portal/test/mocks/users/notification.ts
similarity index 91%
rename from packages/arcgis-rest-users/test/mocks/notification.ts
rename to packages/arcgis-rest-portal/test/mocks/users/notification.ts
index 624e8c8eac..975d2185e9 100644
--- a/packages/arcgis-rest-users/test/mocks/notification.ts
+++ b/packages/arcgis-rest-portal/test/mocks/users/notification.ts
@@ -1,4 +1,4 @@
-import { INotificationResult } from "../../src/notification";
+import { INotificationResult } from "../../../src/users/notification";
 
 export const UserNotificationsResponse: INotificationResult = {
   notifications: [
diff --git a/packages/arcgis-rest-users/test/mocks/user.ts b/packages/arcgis-rest-portal/test/mocks/users/user.ts
similarity index 100%
rename from packages/arcgis-rest-users/test/mocks/user.ts
rename to packages/arcgis-rest-portal/test/mocks/users/user.ts
diff --git a/packages/arcgis-rest-sharing/test/access.test.ts b/packages/arcgis-rest-portal/test/sharing/access.test.ts
similarity index 95%
rename from packages/arcgis-rest-sharing/test/access.test.ts
rename to packages/arcgis-rest-portal/test/sharing/access.test.ts
index ed284da570..8da0862a78 100644
--- a/packages/arcgis-rest-sharing/test/access.test.ts
+++ b/packages/arcgis-rest-portal/test/sharing/access.test.ts
@@ -1,16 +1,13 @@
 /* Copyright (c) 2018 Environmental Systems Research Institute, Inc.
  * Apache-2.0 */
 
-import { setItemAccess } from "../src/index";
+import { setItemAccess } from "../../src/sharing/access";
 import * as fetchMock from "fetch-mock";
 
 import { TOMORROW } from "@esri/arcgis-rest-auth/test/utils";
-import { MOCK_USER_SESSION } from "./mocks/sharing";
+import { MOCK_USER_SESSION } from "../mocks/sharing/sharing";
 
-import {
-  AnonUserResponse,
-  OrgAdminUserResponse
-} from "../../arcgis-rest-users/test/mocks/user";
+import { AnonUserResponse, OrgAdminUserResponse } from "../mocks/users/user";
 
 const SharingResponse = {
   notSharedWith: [] as any,
diff --git a/packages/arcgis-rest-sharing/test/group-sharing.test.ts b/packages/arcgis-rest-portal/test/sharing/group-sharing.test.ts
similarity index 96%
rename from packages/arcgis-rest-sharing/test/group-sharing.test.ts
rename to packages/arcgis-rest-portal/test/sharing/group-sharing.test.ts
index dfc4d6005b..fbfbc65cfe 100644
--- a/packages/arcgis-rest-sharing/test/group-sharing.test.ts
+++ b/packages/arcgis-rest-portal/test/sharing/group-sharing.test.ts
@@ -2,8 +2,11 @@
  * Apache-2.0 */
 
 import * as fetchMock from "fetch-mock";
-import { shareItemWithGroup, unshareItemWithGroup } from "../src/index";
-import { MOCK_USER_SESSION } from "./mocks/sharing";
+import {
+  shareItemWithGroup,
+  unshareItemWithGroup
+} from "../../src/sharing/group-sharing";
+import { MOCK_USER_SESSION } from "../mocks/sharing/sharing";
 import { TOMORROW } from "@esri/arcgis-rest-auth/test/utils";
 
 import {
@@ -12,9 +15,9 @@ import {
   GroupMemberUserResponse,
   GroupAdminUserResponse,
   OrgAdminUserResponse
-} from "../../arcgis-rest-users/test/mocks/user";
+} from "../mocks/users/user";
 
-import { SearchResponse } from "../../arcgis-rest-items/test/mocks/search";
+import { SearchResponse } from "../mocks/items/search";
 
 const SharingResponse = {
   notSharedWith: [] as any,
@@ -166,6 +169,11 @@ describe("shareItemWithGroup() ::", () => {
       SearchResponse
     );
 
+    fetchMock.once(
+      "https://myorg.maps.arcgis.com/sharing/rest/community/groups/t6b?f=json&token=fake-token",
+      GroupNonMemberUserResponse
+    );
+
     shareItemWithGroup({
       authentication: MOCK_USER_SESSION,
       id: "n3v",
@@ -559,6 +567,7 @@ describe("unshareItemWithGroup() ::", () => {
       });
   });
 
+  // this one
   it("should throw if the person trying to unshare doesnt own the item, is not an admin or member of said group", done => {
     fetchMock.once(
       "https://myorg.maps.arcgis.com/sharing/rest/community/users/jsmith?f=json&token=fake-token",
@@ -570,6 +579,11 @@ describe("unshareItemWithGroup() ::", () => {
       SearchResponse
     );
 
+    fetchMock.once(
+      "https://myorg.maps.arcgis.com/sharing/rest/community/groups/t6b?f=json&token=fake-token",
+      GroupNonMemberUserResponse
+    );
+
     unshareItemWithGroup({
       authentication: MOCK_USER_SESSION,
       id: "a5b",
diff --git a/packages/arcgis-rest-sharing/test/helpers.test.ts b/packages/arcgis-rest-portal/test/sharing/helpers.test.ts
similarity index 92%
rename from packages/arcgis-rest-sharing/test/helpers.test.ts
rename to packages/arcgis-rest-portal/test/sharing/helpers.test.ts
index 8ebb3b9e61..9550bddadb 100644
--- a/packages/arcgis-rest-sharing/test/helpers.test.ts
+++ b/packages/arcgis-rest-portal/test/sharing/helpers.test.ts
@@ -2,8 +2,8 @@
  * Apache-2.0 */
 
 import * as fetchMock from "fetch-mock";
-import { getUserMembership } from "../src/helpers";
-import { MOCK_USER_SESSION } from "./mocks/sharing";
+import { getUserMembership } from "../../src/sharing/helpers";
+import { MOCK_USER_SESSION } from "../mocks/sharing/sharing";
 import {
   GroupOwnerResponse,
   GroupNoAccessResponse
diff --git a/packages/arcgis-rest-users/test/get.test.ts b/packages/arcgis-rest-portal/test/users/get.test.ts
similarity index 97%
rename from packages/arcgis-rest-users/test/get.test.ts
rename to packages/arcgis-rest-portal/test/users/get.test.ts
index 3fc565a53c..df5030f83d 100644
--- a/packages/arcgis-rest-users/test/get.test.ts
+++ b/packages/arcgis-rest-portal/test/users/get.test.ts
@@ -1,13 +1,13 @@
 /* Copyright (c) 2018 Environmental Systems Research Institute, Inc.
  * Apache-2.0 */
 
-import { getUser } from "../src/index";
+import { getUser } from "../../src/users/get";
 
 import {
   AnonUserResponse,
   GroupMemberUserResponse,
   GroupAdminUserResponse
-} from "./mocks/user";
+} from "../mocks/users/user";
 
 import { UserSession } from "@esri/arcgis-rest-auth";
 import * as fetchMock from "fetch-mock";
diff --git a/packages/arcgis-rest-users/test/invitation.test.ts b/packages/arcgis-rest-portal/test/users/invitation.test.ts
similarity index 98%
rename from packages/arcgis-rest-users/test/invitation.test.ts
rename to packages/arcgis-rest-portal/test/users/invitation.test.ts
index c0bc1fc2fb..0ff0061728 100644
--- a/packages/arcgis-rest-users/test/invitation.test.ts
+++ b/packages/arcgis-rest-portal/test/users/invitation.test.ts
@@ -6,12 +6,12 @@ import {
   getUserInvitation,
   acceptInvitation,
   declineInvitation
-} from "../src/index";
+} from "../../src/users/invitation";
 
 import {
   UserInvitationsResponse,
   UserInvitationResponse
-} from "./mocks/invitation";
+} from "../mocks/users/invitation";
 
 import { encodeParam } from "@esri/arcgis-rest-request";
 import { UserSession } from "@esri/arcgis-rest-auth";
diff --git a/packages/arcgis-rest-users/test/notification.test.ts b/packages/arcgis-rest-portal/test/users/notification.test.ts
similarity index 94%
rename from packages/arcgis-rest-users/test/notification.test.ts
rename to packages/arcgis-rest-portal/test/users/notification.test.ts
index f52a1f47c2..42ad6dde60 100644
--- a/packages/arcgis-rest-users/test/notification.test.ts
+++ b/packages/arcgis-rest-portal/test/users/notification.test.ts
@@ -1,12 +1,15 @@
 /* Copyright (c) 2018 Environmental Systems Research Institute, Inc.
  * Apache-2.0 */
 
-import { getUserNotifications, removeNotification } from "../src/index";
+import {
+  getUserNotifications,
+  removeNotification
+} from "../../src/users/notification";
 
 import {
   UserNotificationsResponse,
   IDeleteSuccessResponse
-} from "./mocks/notification";
+} from "../mocks/users/notification";
 
 import { encodeParam } from "@esri/arcgis-rest-request";
 import { UserSession } from "@esri/arcgis-rest-auth";
diff --git a/packages/arcgis-rest-users/test/update.test.ts b/packages/arcgis-rest-portal/test/users/update.test.ts
similarity index 98%
rename from packages/arcgis-rest-users/test/update.test.ts
rename to packages/arcgis-rest-portal/test/users/update.test.ts
index 9239ca0875..65c40687a3 100644
--- a/packages/arcgis-rest-users/test/update.test.ts
+++ b/packages/arcgis-rest-portal/test/users/update.test.ts
@@ -1,7 +1,7 @@
 /* Copyright (c) 2018-2019 Environmental Systems Research Institute, Inc.
  * Apache-2.0 */
 
-import { updateUser, IUpdateUserResponse } from "../src/index";
+import { updateUser, IUpdateUserResponse } from "../../src/users/update";
 import { encodeParam } from "@esri/arcgis-rest-request";
 import { UserSession } from "@esri/arcgis-rest-auth";
 import * as fetchMock from "fetch-mock";
diff --git a/packages/arcgis-rest-groups/tsconfig.json b/packages/arcgis-rest-portal/tsconfig.json
similarity index 100%
rename from packages/arcgis-rest-groups/tsconfig.json
rename to packages/arcgis-rest-portal/tsconfig.json
diff --git a/packages/arcgis-rest-sharing/README.md b/packages/arcgis-rest-sharing/README.md
deleted file mode 100644
index 7202f14bae..0000000000
--- a/packages/arcgis-rest-sharing/README.md
+++ /dev/null
@@ -1,74 +0,0 @@
-[![npm version][npm-img]][npm-url]
-[![build status][travis-img]][travis-url]
-[![gzip bundle size][gzip-image]][npm-url]
-[![Coverage Status][coverage-img]][coverage-url]
-[![apache licensed](https://img.shields.io/badge/license-Apache-green.svg?style=flat-square)](https://raw.githubusercontent.com/Esri/arcgis-rest-js/master/LICENSE)
-
-[npm-img]: https://img.shields.io/npm/v/@esri/arcgis-rest-sharing.svg?style=flat-square
-[npm-url]: https://www.npmjs.com/package/@esri/arcgis-rest-sharing
-[travis-img]: https://img.shields.io/travis/Esri/arcgis-rest-js/master.svg?style=flat-square
-[travis-url]: https://travis-ci.org/Esri/arcgis-rest-js
-[gzip-image]: https://img.badgesize.io/https://unpkg.com/@esri/arcgis-rest-sharing/dist/umd/sharing.umd.min.js?compression=gzip
-[coverage-img]: https://codecov.io/gh/Esri/arcgis-rest-js/branch/master/graph/badge.svg
-[coverage-url]: https://codecov.io/gh/Esri/arcgis-rest-js
-
-# @esri/arcgis-rest-sharing
-
-> Helper utilities for managing access to ArcGIS content in Node.js and modern browsers.
-
-### Example
-
-```bash
-npm install @esri/arcgis-rest-request
-npm install @esri/arcgis-rest-sharing
-```
-
-```js
-import { setItemAccess } from '@esri/arcgis-rest-sharing';
-
-const itemId = "abc123";
-
-setItemAccess({
-    id: itemId,
-    access: "public",
-    authentication: session
-})
-```
-
-### [API Reference](https://esri.github.io/arcgis-rest-js/api/sharing/)
-
-### Issues
-
-If something isn't working the way you expected, please take a look at [previously logged issues](https://github.com/Esri/arcgis-rest-js/issues) first.  Have you found a new bug?  Want to request a new feature?  We'd [**love**](https://github.com/Esri/arcgis-rest-js/issues/new) to hear from you.
-
-If you're looking for help you can also post issues on [GIS Stackexchange](http://gis.stackexchange.com/questions/ask?tags=esri-oss).
-
-### Versioning
-
-For transparency into the release cycle and in striving to maintain backward compatibility, @esri/arcgis-rest-js is maintained under Semantic Versioning guidelines and will adhere to these rules whenever possible.
-
-For more information on SemVer, please visit <http://semver.org/>.
-
-### Contributing
-
-Esri welcomes contributions from anyone and everyone. Please see our [guidelines for contributing](CONTRIBUTING.md).
-
-### [Changelog](https://github.com/Esri/arcgis-rest-js/blob/master/CHANGELOG.md)
-
-### License
-
-Copyright &copy; 2018 Esri
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-> http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-A copy of the license is available in the repository's [LICENSE](../../LICENSE) file.
\ No newline at end of file
diff --git a/packages/arcgis-rest-sharing/package-lock.json b/packages/arcgis-rest-sharing/package-lock.json
deleted file mode 100644
index 8714b9aab7..0000000000
--- a/packages/arcgis-rest-sharing/package-lock.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"requires": true,
-	"lockfileVersion": 1,
-	"dependencies": {
-		"tslib": {
-			"version": "1.9.3",
-			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
-			"integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
-		}
-	}
-}
diff --git a/packages/arcgis-rest-sharing/package.json b/packages/arcgis-rest-sharing/package.json
deleted file mode 100644
index c75825c6c0..0000000000
--- a/packages/arcgis-rest-sharing/package.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  "name": "@esri/arcgis-rest-sharing",
-  "version": "1.19.2",
-  "description": "Helper utilities for managing access to ArcGIS content in Node.js and modern browsers.",
-  "main": "dist/node/index.js",
-  "unpkg": "dist/umd/sharing.umd.js",
-  "module": "dist/esm/index.js",
-  "js:next": "dist/esm/index.js",
-  "sideEffects": false,
-  "types": "dist/esm/index.d.ts",
-  "license": "Apache-2.0",
-  "dependencies": {
-    "tslib": "^1.9.3"
-  },
-  "devDependencies": {
-    "@esri/arcgis-rest-auth": "^1.19.2",
-    "@esri/arcgis-rest-common": "^1.19.2",
-    "@esri/arcgis-rest-groups": "^1.19.2",
-    "@esri/arcgis-rest-request": "^1.19.2"
-  },
-  "peerDependencies": {
-    "@esri/arcgis-rest-auth": "^1.19.2",
-    "@esri/arcgis-rest-common": "^1.19.2",
-    "@esri/arcgis-rest-groups": "^1.19.2",
-    "@esri/arcgis-rest-request": "^1.19.2"
-  },
-  "files": [
-    "dist/**"
-  ],
-  "scripts": {
-    "prepare": "npm run build",
-    "build": "npm run build:node && npm run build:umd && npm run build:esm",
-    "build:esm": "tsc --module es2015 --outDir ./dist/esm --declaration",
-    "build:umd": "rollup -c ../../umd-base-profile.js && rollup -c ../../umd-production-profile.js",
-    "build:node": "tsc --module commonjs --outDir ./dist/node",
-    "dev:esm": "tsc -w --module es2015 --outDir ./dist/esm --declaration",
-    "dev:umd": "rollup -w -c ../../umd-base-profile.js",
-    "dev:node": "tsc -w --module commonjs --outDir ./dist/node"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Esri/arcgis-rest-js.git"
-  },
-  "contributors": [
-    {
-      "name": "John Gravois",
-      "email": "john@esri.com"
-    },
-    {
-      "name": "Tom Wayson",
-      "email": "tom@tomwayson.com"
-    }
-  ],
-  "bugs": {
-    "url": "https://github.com/Esri/arcgis-rest-js/issues"
-  },
-  "homepage": "https://github.com/Esri/arcgis-rest-js#readme",
-  "keywords": [
-    "typescript",
-    "promise",
-    "fetch",
-    "arcgis",
-    "esri",
-    "ES6"
-  ]
-}
diff --git a/packages/arcgis-rest-sharing/src/index.ts b/packages/arcgis-rest-sharing/src/index.ts
deleted file mode 100644
index 21ce890660..0000000000
--- a/packages/arcgis-rest-sharing/src/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-/* Copyright (c) 2018 Environmental Systems Research Institute, Inc.
- * Apache-2.0 */
-
-export * from "./access";
-export * from "./group-sharing";
diff --git a/packages/arcgis-rest-sharing/tsconfig.json b/packages/arcgis-rest-sharing/tsconfig.json
deleted file mode 100644
index 90cbf37afa..0000000000
--- a/packages/arcgis-rest-sharing/tsconfig.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "extends": "../../tsconfig.json",
-    "include": [
-        "src/**/*.ts"
-    ]
-}
\ No newline at end of file
diff --git a/packages/arcgis-rest-users/README.md b/packages/arcgis-rest-users/README.md
deleted file mode 100644
index 844cd88831..0000000000
--- a/packages/arcgis-rest-users/README.md
+++ /dev/null
@@ -1,78 +0,0 @@
-[![npm version][npm-img]][npm-url]
-[![build status][travis-img]][travis-url]
-[![gzip bundle size][gzip-image]][npm-url]
-[![Coverage Status][coverage-img]][coverage-url]
-[![apache licensed](https://img.shields.io/badge/license-Apache-green.svg?style=flat-square)](https://raw.githubusercontent.com/Esri/arcgis-rest-js/master/LICENSE)
-
-[npm-img]: https://img.shields.io/npm/v/@esri/arcgis-rest-users.svg?style=flat-square
-[npm-url]: https://www.npmjs.com/package/@esri/arcgis-rest-users
-[travis-img]: https://img.shields.io/travis/Esri/arcgis-rest-js/master.svg?style=flat-square
-[travis-url]: https://travis-ci.org/Esri/arcgis-rest-js
-[gzip-image]: https://img.badgesize.io/https://unpkg.com/@esri/arcgis-rest-users/dist/umd/users.umd.min.js?compression=gzip
-[coverage-img]: https://codecov.io/gh/Esri/arcgis-rest-js/branch/master/graph/badge.svg
-[coverage-url]: https://codecov.io/gh/Esri/arcgis-rest-js
-
-# @esri/arcgis-rest-users
-
-> A module for working with users in the ArcGIS REST API that runs in Node.js and modern browsers.
-
-### Example
-
-```bash
-npm install @esri/arcgis-rest-users
-```
-
-```js
-import { getUser } from '@esri/arcgis-rest-groups';
-
-getUser("jsmith")
-    .then(response => {
-        /*
-        {
-            firstName: "John",
-            lastName: "Smith",
-            tags: ["GIS Analyst", "City of Redlands"],
-            thumbnail: "myProfile.jpg",
-            created: 1258501046000,
-            modified: 1290625562000,
-             d eetc.
-        };
-        */
-    });
-```
-
-### Issues
-
-If something isn't working the way you expected, please take a look at [previously logged issues](https://github.com/Esri/arcgis-rest-js/issues) first.  Have you found a new bug?  Want to request a new feature?  We'd [**love**](https://github.com/Esri/arcgis-rest-js/issues/new) to hear from you.
-
-If you're looking for help you can also post issues on [GIS Stackexchange](http://gis.stackexchange.com/questions/ask?tags=esri-oss).
-
-### Versioning
-
-For transparency into the release cycle and in striving to maintain backward compatibility, @esri/arcgis-rest-js is maintained under Semantic Versioning guidelines and will adhere to these rules whenever possible.
-
-For more information on SemVer, please visit <http://semver.org/>.
-
-### Contributing
-
-Esri welcomes contributions from anyone and everyone. Please see our [guidelines for contributing](CONTRIBUTING.md).
-
-### [Changelog](https://github.com/Esri/arcgis-rest-js/blob/master/CHANGELOG.md)
-
-### License
-
-Copyright &copy; 2018 Esri
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-> http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-A copy of the license is available in the repository's [LICENSE](../../LICENSE) file.
\ No newline at end of file
diff --git a/packages/arcgis-rest-users/package-lock.json b/packages/arcgis-rest-users/package-lock.json
deleted file mode 100644
index 8714b9aab7..0000000000
--- a/packages/arcgis-rest-users/package-lock.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"requires": true,
-	"lockfileVersion": 1,
-	"dependencies": {
-		"tslib": {
-			"version": "1.9.3",
-			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
-			"integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
-		}
-	}
-}
diff --git a/packages/arcgis-rest-users/package.json b/packages/arcgis-rest-users/package.json
deleted file mode 100644
index 10ebc6c7e1..0000000000
--- a/packages/arcgis-rest-users/package.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  "name": "@esri/arcgis-rest-users",
-  "version": "1.19.2",
-  "description": "Portal user helpers for @esri/arcgis-rest-request",
-  "main": "dist/node/index.js",
-  "unpkg": "dist/umd/users.umd.js",
-  "module": "dist/esm/index.js",
-  "js:next": "dist/esm/index.js",
-  "sideEffects": false,
-  "types": "dist/esm/index.d.ts",
-  "license": "Apache-2.0",
-  "files": [
-    "dist/**"
-  ],
-  "dependencies": {
-    "tslib": "^1.9.3"
-  },
-  "devDependencies": {
-    "@esri/arcgis-rest-auth": "^1.19.2",
-    "@esri/arcgis-rest-common": "^1.19.2",
-    "@esri/arcgis-rest-request": "^1.19.2"
-  },
-  "peerDependencies": {
-    "@esri/arcgis-rest-auth": "^1.19.2",
-    "@esri/arcgis-rest-common": "^1.19.2",
-    "@esri/arcgis-rest-request": "^1.19.2"
-  },
-  "scripts": {
-    "prepare": "npm run build",
-    "build": "npm run build:node && npm run build:umd && npm run build:esm",
-    "build:esm": "tsc --module es2015 --outDir ./dist/esm --declaration",
-    "build:umd": "rollup -c ../../umd-base-profile.js && rollup -c ../../umd-production-profile.js",
-    "build:node": "tsc --module commonjs --outDir ./dist/node",
-    "dev:esm": "tsc -w --module es2015 --outDir ./dist/esm --declaration",
-    "dev:umd": "rollup -w -c ../../umd-base-profile.js",
-    "dev:node": "tsc -w --module commonjs --outDir ./dist/node"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Esri/arcgis-rest-js.git"
-  },
-  "contributors": [
-    {
-      "name": "John Gravois",
-      "email": "john@esri.com"
-    }
-  ],
-  "bugs": {
-    "url": "https://github.com/Esri/arcgis-rest-js/issues"
-  },
-  "homepage": "https://github.com/Esri/arcgis-rest-js#readme",
-  "keywords": [
-    "typescript",
-    "promise",
-    "fetch",
-    "arcgis",
-    "esri",
-    "ES6"
-  ]
-}
diff --git a/packages/arcgis-rest-users/src/index.ts b/packages/arcgis-rest-users/src/index.ts
deleted file mode 100644
index 3a2c9023ed..0000000000
--- a/packages/arcgis-rest-users/src/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Copyright (c) 2018 Environmental Systems Research Institute, Inc.
- * Apache-2.0 */
-
-export * from "./get";
-export * from "./update";
-export * from "./notification";
-export * from "./invitation";
diff --git a/packages/arcgis-rest-users/tsconfig.json b/packages/arcgis-rest-users/tsconfig.json
deleted file mode 100644
index 400168ea91..0000000000
--- a/packages/arcgis-rest-users/tsconfig.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "include": [
-      "src/**/*.ts"
-  ]
-}
\ No newline at end of file