diff --git a/packages/patternfly-4/react-core/src/components/AboutModal/AboutModal.js b/packages/patternfly-4/react-core/src/components/AboutModal/AboutModal.js
index 7f6dd631d32..5d96033afc7 100644
--- a/packages/patternfly-4/react-core/src/components/AboutModal/AboutModal.js
+++ b/packages/patternfly-4/react-core/src/components/AboutModal/AboutModal.js
@@ -3,7 +3,7 @@ import ReactDOM from 'react-dom';
 import PropTypes from 'prop-types';
 import AboutModalContainer from './AboutModalContainer';
 import { canUseDOM } from 'exenv';
-import { KEY_CODES } from '../../internal/constants';
+import { KEY_CODES } from '../../helpers/constants';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/patternfly/components/Backdrop/backdrop.css';
 
diff --git a/packages/patternfly-4/react-core/src/components/AboutModal/AboutModal.test.js b/packages/patternfly-4/react-core/src/components/AboutModal/AboutModal.test.js
index 3f86985640e..79de5acc5fb 100644
--- a/packages/patternfly-4/react-core/src/components/AboutModal/AboutModal.test.js
+++ b/packages/patternfly-4/react-core/src/components/AboutModal/AboutModal.test.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import AboutModal from './AboutModal';
 import ReactDOM from 'react-dom';
-import { KEY_CODES } from '../../internal/constants';
+import { KEY_CODES } from '../../helpers/constants';
 
 jest.spyOn(ReactDOM, 'createPortal');
 jest.spyOn(document, 'createElement');
diff --git a/packages/patternfly-4/react-core/src/components/Alert/Alert.js b/packages/patternfly-4/react-core/src/components/Alert/Alert.js
index e9754640111..88d06ce0370 100644
--- a/packages/patternfly-4/react-core/src/components/Alert/Alert.js
+++ b/packages/patternfly-4/react-core/src/components/Alert/Alert.js
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import styles from '@patternfly/patternfly/components/Alert/alert.css';
 import accessibleStyles from '@patternfly/patternfly/utilities/Accessibility/accessibility.css';
 import AlertIcon from './AlertIcon';
-import { capitalize } from '../../internal/util';
+import { capitalize } from '../../helpers/util';
 import AlertActionCloseButton from './AlertActionCloseButton';
 import AlertActionLink from './AlertActionLink';
 
diff --git a/packages/patternfly-4/react-core/src/components/Breadcrumb/BreadcrumbHeading.js b/packages/patternfly-4/react-core/src/components/Breadcrumb/BreadcrumbHeading.js
index 510864bce1d..a31d6ff29ff 100644
--- a/packages/patternfly-4/react-core/src/components/Breadcrumb/BreadcrumbHeading.js
+++ b/packages/patternfly-4/react-core/src/components/Breadcrumb/BreadcrumbHeading.js
@@ -2,7 +2,7 @@ import React from 'react';
 import styles from '@patternfly/patternfly/components/Breadcrumb/breadcrumb.css';
 import PropTypes from 'prop-types';
 import { css } from '@patternfly/react-styles';
-import { componentShape } from '../../internal/componentShape';
+import { componentShape } from '../../helpers/componentShape';
 
 const propTypes = {
   /** Content rendered inside the breadcrumb title. */
diff --git a/packages/patternfly-4/react-core/src/components/Breadcrumb/BreadcrumbItem.js b/packages/patternfly-4/react-core/src/components/Breadcrumb/BreadcrumbItem.js
index 63a52078c40..0765562bbe3 100644
--- a/packages/patternfly-4/react-core/src/components/Breadcrumb/BreadcrumbItem.js
+++ b/packages/patternfly-4/react-core/src/components/Breadcrumb/BreadcrumbItem.js
@@ -3,7 +3,7 @@ import styles from '@patternfly/patternfly/components/Breadcrumb/breadcrumb.css'
 import PropTypes from 'prop-types';
 import { AngleRightIcon } from '@patternfly/react-icons';
 import { css, getModifier } from '@patternfly/react-styles';
-import { componentShape } from '../../internal/componentShape';
+import { componentShape } from '../../helpers/componentShape';
 
 const propTypes = {
   /** Content rendered inside the breadcrumb item. */
diff --git a/packages/patternfly-4/react-core/src/components/Button/Button.js b/packages/patternfly-4/react-core/src/components/Button/Button.js
index 1d08b840568..6df0b450b65 100644
--- a/packages/patternfly-4/react-core/src/components/Button/Button.js
+++ b/packages/patternfly-4/react-core/src/components/Button/Button.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { css, getModifier } from '@patternfly/react-styles';
 import PropTypes from 'prop-types';
-import { componentShape } from '../../internal/componentShape';
+import { componentShape } from '../../helpers/componentShape';
 import styles from '@patternfly/patternfly/components/Button/button.css';
 
 export const ButtonVariant = {
diff --git a/packages/patternfly-4/react-core/src/components/Card/Card.js b/packages/patternfly-4/react-core/src/components/Card/Card.js
index 3b22d535644..f53ef6c02f6 100644
--- a/packages/patternfly-4/react-core/src/components/Card/Card.js
+++ b/packages/patternfly-4/react-core/src/components/Card/Card.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/patternfly/components/Card/card.css';
-import { componentShape } from '../../internal/componentShape';
+import { componentShape } from '../../helpers/componentShape';
 
 const propTypes = {
   /** content rendered inside the Card */
diff --git a/packages/patternfly-4/react-core/src/components/Card/CardBody.js b/packages/patternfly-4/react-core/src/components/Card/CardBody.js
index 779b1edf183..2cd8ba68612 100644
--- a/packages/patternfly-4/react-core/src/components/Card/CardBody.js
+++ b/packages/patternfly-4/react-core/src/components/Card/CardBody.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/patternfly/components/Card/card.css';
-import { componentShape } from '../../internal/componentShape';
+import { componentShape } from '../../helpers/componentShape';
 
 const propTypes = {
   /** content rendered inside the Card Body */
diff --git a/packages/patternfly-4/react-core/src/components/Card/CardFooter.js b/packages/patternfly-4/react-core/src/components/Card/CardFooter.js
index 525c2f5c2f8..1c4c0e85474 100644
--- a/packages/patternfly-4/react-core/src/components/Card/CardFooter.js
+++ b/packages/patternfly-4/react-core/src/components/Card/CardFooter.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/patternfly/components/Card/card.css';
-import { componentShape } from '../../internal/componentShape';
+import { componentShape } from '../../helpers/componentShape';
 
 const propTypes = {
   /** content rendered inside the Card Footer */
diff --git a/packages/patternfly-4/react-core/src/components/Card/CardHeader.js b/packages/patternfly-4/react-core/src/components/Card/CardHeader.js
index 205da0006cf..ce5800d0a19 100644
--- a/packages/patternfly-4/react-core/src/components/Card/CardHeader.js
+++ b/packages/patternfly-4/react-core/src/components/Card/CardHeader.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/patternfly/components/Card/card.css';
-import { componentShape } from '../../internal/componentShape';
+import { componentShape } from '../../helpers/componentShape';
 
 const propTypes = {
   children: PropTypes.any,
diff --git a/packages/patternfly-4/react-core/src/components/Chip/Chip.js b/packages/patternfly-4/react-core/src/components/Chip/Chip.js
index 7f119f7bb36..195556f4ada 100644
--- a/packages/patternfly-4/react-core/src/components/Chip/Chip.js
+++ b/packages/patternfly-4/react-core/src/components/Chip/Chip.js
@@ -5,13 +5,16 @@ import ChipButton from './ChipButton';
 import { Tooltip, TooltipPosition } from '../Tooltip';
 import { TimesCircleIcon } from '@patternfly/react-icons';
 import styles from '@patternfly/patternfly/components/Chip/chip.css';
-import GenerateId from '../../internal/GenerateId/GenerateId';
+import GenerateId from '../../helpers/GenerateId/GenerateId';
+
 class Chip extends React.Component {
   span = React.createRef();
   state = { isTooltipVisible: false };
 
   componentDidMount() {
-    this.setState({ isTooltipVisible: this.span.current && this.span.current.offsetWidth < this.span.current.scrollWidth });
+    this.setState({
+      isTooltipVisible: this.span.current && this.span.current.offsetWidth < this.span.current.scrollWidth
+    });
   }
 
   renderOverflowChip = () => {
@@ -23,16 +26,10 @@ class Chip extends React.Component {
         </ChipButton>
       </div>
     );
-  }
+  };
 
-  renderChip = (randomId) => {
-    const {
-      children,
-      closeBtnAriaLabel,
-      tooltipPosition,
-      className,
-      onClick,
-    } = this.props;
+  renderChip = randomId => {
+    const { children, closeBtnAriaLabel, tooltipPosition, className, onClick } = this.props;
     if (this.state.isTooltipVisible) {
       return (
         <Tooltip position={tooltipPosition} content={children}>
@@ -40,41 +37,44 @@ class Chip extends React.Component {
             <span ref={this.span} className={css(styles.chipText)} id={randomId}>
               {children}
             </span>
-            <ChipButton onClick={onClick} ariaLabel={closeBtnAriaLabel} id={`remove_${randomId}`} aria-labelledby={`remove_${randomId} ${randomId}`}>
+            <ChipButton
+              onClick={onClick}
+              ariaLabel={closeBtnAriaLabel}
+              id={`remove_${randomId}`}
+              aria-labelledby={`remove_${randomId} ${randomId}`}
+            >
               <TimesCircleIcon aria-hidden="true" />
             </ChipButton>
           </div>
         </Tooltip>
-      )
-    } else {
-      return (
-        <div className={css(styles.chip, className)}>
-          <span ref={this.span} className={css(styles.chipText)} id={randomId}>
-            {children}
-          </span>
-          <ChipButton onClick={onClick} ariaLabel={closeBtnAriaLabel} id={`remove_${randomId}`} aria-labelledby={`remove_${randomId} ${randomId}`}>
-            <TimesCircleIcon aria-hidden="true" />
-          </ChipButton>
-        </div>
-      )
+      );
     }
-  }
+    return (
+      <div className={css(styles.chip, className)}>
+        <span ref={this.span} className={css(styles.chipText)} id={randomId}>
+          {children}
+        </span>
+        <ChipButton
+          onClick={onClick}
+          ariaLabel={closeBtnAriaLabel}
+          id={`remove_${randomId}`}
+          aria-labelledby={`remove_${randomId} ${randomId}`}
+        >
+          <TimesCircleIcon aria-hidden="true" />
+        </ChipButton>
+      </div>
+    );
+  };
 
   render() {
-    const {
-      isOverflowChip,
-    } = this.props;
+    const { isOverflowChip } = this.props;
     return (
       <GenerateId>
-        {(randomId) =>
-          (
-            <React.Fragment>
-              {isOverflowChip ? this.renderOverflowChip() : this.renderChip(randomId)}
-            </React.Fragment>
-          )
-        }
+        {randomId => (
+          <React.Fragment>{isOverflowChip ? this.renderOverflowChip() : this.renderChip(randomId)}</React.Fragment>
+        )}
       </GenerateId>
-    )
+    );
   }
 }
 Chip.propTypes = {
@@ -86,12 +86,12 @@ Chip.propTypes = {
   id: PropTypes.string,
   /** Additional classes added to the chip item */
   className: PropTypes.string,
-  /** Flag indicating if the chip has overflow*/
+  /** Flag indicating if the chip has overflow */
   isOverflowChip: PropTypes.bool,
   /** Position of the tooltip which is displayed if text is longer */
   tooltipPosition: PropTypes.oneOf(Object.values(TooltipPosition)),
   /** Function that is called when clicking on the chip button */
-  onClick: PropTypes.func,
+  onClick: PropTypes.func
 };
 
 Chip.defaultProps = {
@@ -99,7 +99,7 @@ Chip.defaultProps = {
   closeBtnAriaLabel: 'close',
   className: '',
   tooltipPosition: 'top',
-  isOverflowChip: false,
+  isOverflowChip: false
 };
 
 export default Chip;
diff --git a/packages/patternfly-4/react-core/src/components/Dropdown/DropdownItem.js b/packages/patternfly-4/react-core/src/components/Dropdown/DropdownItem.js
index 00f7cf33b39..0d00d60c4a8 100644
--- a/packages/patternfly-4/react-core/src/components/Dropdown/DropdownItem.js
+++ b/packages/patternfly-4/react-core/src/components/Dropdown/DropdownItem.js
@@ -3,7 +3,7 @@ import ReactDOM from 'react-dom';
 import styles from '@patternfly/patternfly/components/Dropdown/dropdown.css';
 import { css } from '@patternfly/react-styles';
 import PropTypes from 'prop-types';
-import { componentShape } from '../../internal/componentShape';
+import { componentShape } from '../../helpers/componentShape';
 import { DropdownContext } from './dropdownConstants';
 
 const propTypes = {
diff --git a/packages/patternfly-4/react-core/src/components/Dropdown/DropdownMenu.js b/packages/patternfly-4/react-core/src/components/Dropdown/DropdownMenu.js
index d7ad731edb0..41b80dc49a5 100644
--- a/packages/patternfly-4/react-core/src/components/Dropdown/DropdownMenu.js
+++ b/packages/patternfly-4/react-core/src/components/Dropdown/DropdownMenu.js
@@ -2,7 +2,7 @@ import React from 'react';
 import styles from '@patternfly/patternfly/components/Dropdown/dropdown.css';
 import { css } from '@patternfly/react-styles';
 import PropTypes from 'prop-types';
-import { componentShape } from '../../internal/componentShape';
+import { componentShape } from '../../helpers/componentShape';
 import { DropdownPosition, DropdownContext, DropdownArrowContext } from './dropdownConstants';
 import ReactDOM from 'react-dom';
 
diff --git a/packages/patternfly-4/react-core/src/components/Dropdown/Item.js b/packages/patternfly-4/react-core/src/components/Dropdown/Item.js
index c46d7122238..bdb306ff270 100644
--- a/packages/patternfly-4/react-core/src/components/Dropdown/Item.js
+++ b/packages/patternfly-4/react-core/src/components/Dropdown/Item.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import DropdownItem from './DropdownItem';
 import styles from '@patternfly/patternfly/components/Dropdown/dropdown.css';
 import { css } from '@patternfly/react-styles';
-import { componentShape } from '../../internal/componentShape';
+import { componentShape } from '../../helpers/componentShape';
 import { DropdownArrowContext } from './dropdownConstants';
 
 const Item = ({ className, ...props }) => (
diff --git a/packages/patternfly-4/react-core/src/components/Dropdown/Separator.js b/packages/patternfly-4/react-core/src/components/Dropdown/Separator.js
index f372361f65a..106a7d3ba31 100644
--- a/packages/patternfly-4/react-core/src/components/Dropdown/Separator.js
+++ b/packages/patternfly-4/react-core/src/components/Dropdown/Separator.js
@@ -3,7 +3,7 @@ import DropdownItem from './DropdownItem';
 import PropTypes from 'prop-types';
 import styles from '@patternfly/patternfly/components/Dropdown/dropdown.css';
 import { css } from '@patternfly/react-styles';
-import { componentShape } from '../../internal/componentShape';
+import { componentShape } from '../../helpers/componentShape';
 import { DropdownArrowContext } from './dropdownConstants';
 
 const Separator = ({ className, ...props }) => (
diff --git a/packages/patternfly-4/react-core/src/components/Dropdown/Toggle.js b/packages/patternfly-4/react-core/src/components/Dropdown/Toggle.js
index 0874c925310..20ae3840b7a 100644
--- a/packages/patternfly-4/react-core/src/components/Dropdown/Toggle.js
+++ b/packages/patternfly-4/react-core/src/components/Dropdown/Toggle.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import styles from '@patternfly/patternfly/components/Dropdown/dropdown.css';
 import { css } from '@patternfly/react-styles';
 import PropTypes from 'prop-types';
-import { KEY_CODES } from '../../internal/constants';
+import { KEY_CODES } from '../../helpers/constants';
 
 const propTypes = {
   /** HTML ID of dropdown toggle */
@@ -64,7 +64,12 @@ class DropdownToggle extends Component {
   onEscPress = event => {
     const { parentRef } = this.props;
     const keyCode = event.keyCode || event.which;
-    if (this.props.isOpen && (keyCode === KEY_CODES.ESCAPE_KEY || event.key === 'Tab') && parentRef && parentRef.contains(event.target)) {
+    if (
+      this.props.isOpen &&
+      (keyCode === KEY_CODES.ESCAPE_KEY || event.key === 'Tab') &&
+      parentRef &&
+      parentRef.contains(event.target)
+    ) {
       this.props.onToggle && this.props.onToggle(false);
       this.toggle.focus();
     }
diff --git a/packages/patternfly-4/react-core/src/components/Form/FormGroup.js b/packages/patternfly-4/react-core/src/components/Form/FormGroup.js
index 8f2728bfa32..fcdb7dd61dd 100644
--- a/packages/patternfly-4/react-core/src/components/Form/FormGroup.js
+++ b/packages/patternfly-4/react-core/src/components/Form/FormGroup.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import styles from '@patternfly/patternfly/components/Form/form.css';
-import { ASTERISK } from '../../internal/htmlConstants';
+import { ASTERISK } from '../../helpers/htmlConstants';
 import { FormContext } from '../Form/FormContext';
 import { css, getModifier } from '@patternfly/react-styles';
 
diff --git a/packages/patternfly-4/react-core/src/components/Modal/Modal.js b/packages/patternfly-4/react-core/src/components/Modal/Modal.js
index f45e3440233..b01d9af1105 100644
--- a/packages/patternfly-4/react-core/src/components/Modal/Modal.js
+++ b/packages/patternfly-4/react-core/src/components/Modal/Modal.js
@@ -2,9 +2,9 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import PropTypes from 'prop-types';
 import ModalContent from './ModalContent';
-import safeHTMLElement from '../../internal/safeHTMLElement';
+import safeHTMLElement from '../../helpers/safeHTMLElement';
 import { canUseDOM } from 'exenv';
-import { KEY_CODES } from '../../internal/constants';
+import { KEY_CODES } from '../../helpers/constants';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/patternfly/components/Backdrop/backdrop.css';
 
diff --git a/packages/patternfly-4/react-core/src/components/Modal/Modal.test.js b/packages/patternfly-4/react-core/src/components/Modal/Modal.test.js
index 398b851c7ac..0f853ef09b6 100644
--- a/packages/patternfly-4/react-core/src/components/Modal/Modal.test.js
+++ b/packages/patternfly-4/react-core/src/components/Modal/Modal.test.js
@@ -2,7 +2,7 @@ import Modal from './Modal';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { shallow } from 'enzyme';
-import { KEY_CODES } from '../../internal/constants';
+import { KEY_CODES } from '../../helpers/constants';
 
 jest.spyOn(ReactDOM, 'createPortal');
 jest.spyOn(document, 'createElement');
diff --git a/packages/patternfly-4/react-core/src/components/Nav/NavExpandable.js b/packages/patternfly-4/react-core/src/components/Nav/NavExpandable.js
index e5f92b36967..7c0aa872132 100644
--- a/packages/patternfly-4/react-core/src/components/Nav/NavExpandable.js
+++ b/packages/patternfly-4/react-core/src/components/Nav/NavExpandable.js
@@ -6,7 +6,7 @@ import PropTypes from 'prop-types';
 import NavToggle from './NavToggle';
 import { AngleRightIcon } from '@patternfly/react-icons';
 import { NavContext } from './Nav';
-import { getUniqueId } from '../../internal/util';
+import { getUniqueId } from '../../helpers/util';
 
 const propTypes = {
   /** Title shown for the expandable list */
diff --git a/packages/patternfly-4/react-core/src/components/Nav/NavGroup.js b/packages/patternfly-4/react-core/src/components/Nav/NavGroup.js
index 4f3db0427a9..1f389739858 100644
--- a/packages/patternfly-4/react-core/src/components/Nav/NavGroup.js
+++ b/packages/patternfly-4/react-core/src/components/Nav/NavGroup.js
@@ -2,7 +2,7 @@ import React from 'react';
 import styles from '@patternfly/patternfly/components/Nav/nav.css';
 import { css } from '@patternfly/react-styles';
 import PropTypes from 'prop-types';
-import { getUniqueId } from '../../internal/util';
+import { getUniqueId } from '../../helpers/util';
 
 const propTypes = {
   /** Title shown for the group */
diff --git a/packages/patternfly-4/react-core/src/components/Page/Page.js b/packages/patternfly-4/react-core/src/components/Page/Page.js
index 008e9c8fb28..3197e2a15ae 100644
--- a/packages/patternfly-4/react-core/src/components/Page/Page.js
+++ b/packages/patternfly-4/react-core/src/components/Page/Page.js
@@ -3,7 +3,7 @@ import styles from '@patternfly/patternfly/components/Page/page.css';
 import { css } from '@patternfly/react-styles';
 import PropTypes from 'prop-types';
 import { global_breakpoint_md as globalBreakpointMd } from '@patternfly/react-tokens';
-import { debounce } from '../../internal/util';
+import { debounce } from '../../helpers/util';
 
 export const PageLayouts = {
   vertical: 'vertical',
diff --git a/packages/patternfly-4/react-core/src/components/Popover/Popover.js b/packages/patternfly-4/react-core/src/components/Popover/Popover.js
index 4bb1e8e5611..7beeb5fd323 100644
--- a/packages/patternfly-4/react-core/src/components/Popover/Popover.js
+++ b/packages/patternfly-4/react-core/src/components/Popover/Popover.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import Tippy from '@tippy.js/react';
 import FocusTrap from 'focus-trap-react';
-import { KEY_CODES } from '../../internal/constants';
+import { KEY_CODES } from '../../helpers/constants';
 import styles from '@patternfly/patternfly/components/Popover/popover.css';
 import { css, getModifier } from '@patternfly/react-styles';
 import PopoverArrow from './PopoverArrow';
@@ -11,7 +11,7 @@ import PopoverBody from './PopoverBody';
 import PopoverHeader from './PopoverHeader';
 import PopoverFooter from './PopoverFooter';
 import PopoverCloseButton from './PopoverCloseButton';
-import GenerateId from '../../internal/GenerateId/GenerateId';
+import GenerateId from '../../helpers/GenerateId/GenerateId';
 import { c_popover_MaxWidth as popoverMaxWidth } from '@patternfly/react-tokens';
 import { tippyStyles } from '../Tooltip/styles';
 
diff --git a/packages/patternfly-4/react-core/src/components/Popover/Popover.tsx.txt b/packages/patternfly-4/react-core/src/components/Popover/Popover.tsx.txt
index 30ae7e4fbea..9072b64f865 100644
--- a/packages/patternfly-4/react-core/src/components/Popover/Popover.tsx.txt
+++ b/packages/patternfly-4/react-core/src/components/Popover/Popover.tsx.txt
@@ -9,7 +9,7 @@ import PopoverContent from './PopoverContent';
 import PopoverBody from './PopoverBody';
 import PopoverHeader from './PopoverHeader';
 import PopoverCloseButton from './PopoverCloseButton';
-import GenerateId from '../../internal/GenerateId/GenerateId';
+import GenerateId from '../../helpers/GenerateId/GenerateId';
 import { Instance, BasicPlacement } from 'tippy.js';
 
 // Need to unset tippy default styles
diff --git a/packages/patternfly-4/react-core/src/components/Progress/Progress.js b/packages/patternfly-4/react-core/src/components/Progress/Progress.js
index 1ada6f28361..3b2183b86f6 100644
--- a/packages/patternfly-4/react-core/src/components/Progress/Progress.js
+++ b/packages/patternfly-4/react-core/src/components/Progress/Progress.js
@@ -3,7 +3,7 @@ import styles from '@patternfly/patternfly/components/Progress/progress.css';
 import { css, getModifier } from '@patternfly/react-styles';
 import PropTypes from 'prop-types';
 import ProgressContainer, { ProgressMeasureLocation, ProgressVariant } from './ProgressContainer';
-import { getUniqueId } from '../../internal/util';
+import { getUniqueId } from '../../helpers/util';
 
 export const ProgressSize = {
   sm: 'sm',
diff --git a/packages/patternfly-4/react-core/src/components/Switch/Switch.js b/packages/patternfly-4/react-core/src/components/Switch/Switch.js
index 86d223ec491..e60d1a8d351 100644
--- a/packages/patternfly-4/react-core/src/components/Switch/Switch.js
+++ b/packages/patternfly-4/react-core/src/components/Switch/Switch.js
@@ -2,7 +2,7 @@ import React from 'react';
 import styles from '@patternfly/patternfly/components/Switch/switch.css';
 import { css } from '@patternfly/react-styles';
 import PropTypes from 'prop-types';
-import { getUniqueId } from '../../internal/util';
+import { getUniqueId } from '../../helpers/util';
 
 const propTypes = {
   /** id for the label. */
diff --git a/packages/patternfly-4/react-core/src/components/Tabs/Tabs.js b/packages/patternfly-4/react-core/src/components/Tabs/Tabs.js
index 99760d604b3..8c0a0ba3182 100644
--- a/packages/patternfly-4/react-core/src/components/Tabs/Tabs.js
+++ b/packages/patternfly-4/react-core/src/components/Tabs/Tabs.js
@@ -3,8 +3,8 @@ import styles from '@patternfly/patternfly/components/Tabs/tabs.css';
 import { css } from '@patternfly/react-styles';
 import PropTypes from 'prop-types';
 import { AngleLeftIcon, AngleRightIcon } from '@patternfly/react-icons';
-import { getUniqueId, isElementInView, sideElementIsOutOfView } from '../../internal/util';
-import { SIDE } from '../../internal/constants';
+import { getUniqueId, isElementInView, sideElementIsOutOfView } from '../../helpers/util';
+import { SIDE } from '../../helpers/constants';
 
 const propTypes = {
   /** content rendered inside the Tabs Component. */
diff --git a/packages/patternfly-4/react-core/src/components/Tooltip/Tooltip.js b/packages/patternfly-4/react-core/src/components/Tooltip/Tooltip.js
index 68e4a226008..e044aeaa565 100644
--- a/packages/patternfly-4/react-core/src/components/Tooltip/Tooltip.js
+++ b/packages/patternfly-4/react-core/src/components/Tooltip/Tooltip.js
@@ -5,7 +5,7 @@ import styles from '@patternfly/patternfly/components/Tooltip/tooltip.css';
 import { css, getModifier } from '@patternfly/react-styles';
 import TooltipArrow from './TooltipArrow';
 import TooltipContent from './TooltipContent';
-import { KEY_CODES } from '../../internal/constants';
+import { KEY_CODES } from '../../helpers/constants';
 import { c_tooltip_MaxWidth as tooltipMaxWidth } from '@patternfly/react-tokens';
 import { tippyStyles } from './styles';
 
diff --git a/packages/patternfly-4/react-core/src/helpers/GenerateId/GenerateId.d.ts b/packages/patternfly-4/react-core/src/helpers/GenerateId/GenerateId.d.ts
new file mode 100644
index 00000000000..68c4189c91b
--- /dev/null
+++ b/packages/patternfly-4/react-core/src/helpers/GenerateId/GenerateId.d.ts
@@ -0,0 +1,10 @@
+import { ComponentClass, ReactNode } from 'react';
+
+export interface GenerateIdProps {
+  prefix?: string;
+  children(id: string): ReactNode;
+}
+
+declare const GenerateId: ComponentClass<GenerateId>;
+
+export default GenerateId;
diff --git a/packages/patternfly-4/react-core/src/internal/GenerateId/GenerateId.js b/packages/patternfly-4/react-core/src/helpers/GenerateId/GenerateId.js
similarity index 100%
rename from packages/patternfly-4/react-core/src/internal/GenerateId/GenerateId.js
rename to packages/patternfly-4/react-core/src/helpers/GenerateId/GenerateId.js
diff --git a/packages/patternfly-4/react-core/src/internal/GenerateId/GenerateId.test.js b/packages/patternfly-4/react-core/src/helpers/GenerateId/GenerateId.test.js
similarity index 100%
rename from packages/patternfly-4/react-core/src/internal/GenerateId/GenerateId.test.js
rename to packages/patternfly-4/react-core/src/helpers/GenerateId/GenerateId.test.js
diff --git a/packages/patternfly-4/react-core/src/internal/GenerateId/__snapshots__/GenerateId.test.js.snap b/packages/patternfly-4/react-core/src/helpers/GenerateId/__snapshots__/GenerateId.test.js.snap
similarity index 100%
rename from packages/patternfly-4/react-core/src/internal/GenerateId/__snapshots__/GenerateId.test.js.snap
rename to packages/patternfly-4/react-core/src/helpers/GenerateId/__snapshots__/GenerateId.test.js.snap
diff --git a/packages/patternfly-4/react-core/src/internal/componentShape.js b/packages/patternfly-4/react-core/src/helpers/componentShape.js
similarity index 100%
rename from packages/patternfly-4/react-core/src/internal/componentShape.js
rename to packages/patternfly-4/react-core/src/helpers/componentShape.js
diff --git a/packages/patternfly-4/react-core/src/internal/constants.js b/packages/patternfly-4/react-core/src/helpers/constants.ts
similarity index 100%
rename from packages/patternfly-4/react-core/src/internal/constants.js
rename to packages/patternfly-4/react-core/src/helpers/constants.ts
diff --git a/packages/patternfly-4/react-core/src/internal/htmlConstants.js b/packages/patternfly-4/react-core/src/helpers/htmlConstants.ts
similarity index 100%
rename from packages/patternfly-4/react-core/src/internal/htmlConstants.js
rename to packages/patternfly-4/react-core/src/helpers/htmlConstants.ts
diff --git a/packages/patternfly-4/react-core/src/helpers/index.ts b/packages/patternfly-4/react-core/src/helpers/index.ts
new file mode 100644
index 00000000000..b4fadcda68d
--- /dev/null
+++ b/packages/patternfly-4/react-core/src/helpers/index.ts
@@ -0,0 +1,4 @@
+export { default as GenerateId } from './GenerateId/GenerateId';
+export * from './util';
+export * from './constants';
+export * from './htmlConstants';
diff --git a/packages/patternfly-4/react-core/src/internal/safeHTMLElement.js b/packages/patternfly-4/react-core/src/helpers/safeHTMLElement.js
similarity index 100%
rename from packages/patternfly-4/react-core/src/internal/safeHTMLElement.js
rename to packages/patternfly-4/react-core/src/helpers/safeHTMLElement.js
diff --git a/packages/patternfly-4/react-core/src/internal/util.test.js b/packages/patternfly-4/react-core/src/helpers/util.test.js
similarity index 100%
rename from packages/patternfly-4/react-core/src/internal/util.test.js
rename to packages/patternfly-4/react-core/src/helpers/util.test.js
diff --git a/packages/patternfly-4/react-core/src/internal/util.js b/packages/patternfly-4/react-core/src/helpers/util.ts
similarity index 89%
rename from packages/patternfly-4/react-core/src/internal/util.js
rename to packages/patternfly-4/react-core/src/helpers/util.ts
index ee535b319b0..0377bd68686 100644
--- a/packages/patternfly-4/react-core/src/internal/util.js
+++ b/packages/patternfly-4/react-core/src/helpers/util.ts
@@ -1,6 +1,6 @@
 import { SIDE } from './constants';
 
-export function capitalize(input) {
+export function capitalize(input: string) {
   return input[0].toUpperCase() + input.substring(1);
 }
 
@@ -13,11 +13,11 @@ export function getUniqueId(prefix = 'pf') {
   return `${prefix}-${uid}`;
 }
 
-export function debounce(func, wait) {
-  let timeout;
-  return (...args) => {
+export function debounce(func: (...args: any[]) => any, wait: number) {
+  let timeout: number;
+  return (...args: any[]) => {
     clearTimeout(timeout);
-    timeout = setTimeout(() => func.apply(this, args), wait);
+    timeout = setTimeout(() => func.apply(this, args), wait) as any;
   };
 }
 
diff --git a/packages/patternfly-4/react-core/src/index.ts b/packages/patternfly-4/react-core/src/index.ts
index aa8ef40c2e7..2a0d4ff1507 100644
--- a/packages/patternfly-4/react-core/src/index.ts
+++ b/packages/patternfly-4/react-core/src/index.ts
@@ -1,4 +1,5 @@
 export * from './components';
 export * from './layouts';
+export * from './helpers';
 export { GutterSize } from './styles/gutters';
 export { BaseSizes, DeviceSizes } from './styles/sizes';
diff --git a/packages/patternfly-4/react-core/src/layouts/Bullseye/Bullseye.js b/packages/patternfly-4/react-core/src/layouts/Bullseye/Bullseye.js
index 18a397fb2a6..7df2e0a31fd 100644
--- a/packages/patternfly-4/react-core/src/layouts/Bullseye/Bullseye.js
+++ b/packages/patternfly-4/react-core/src/layouts/Bullseye/Bullseye.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/patternfly/layouts/Bullseye/bullseye.css';
 import PropTypes from 'prop-types';
-import { componentShape } from '../../internal/componentShape';
+import { componentShape } from '../../helpers/componentShape';
 
 const propTypes = {
   /** content rendered inside the Bullseye layout */
diff --git a/packages/patternfly-4/react-core/src/layouts/Split/Split.js b/packages/patternfly-4/react-core/src/layouts/Split/Split.js
index 906181a7f5b..111e8626f5a 100644
--- a/packages/patternfly-4/react-core/src/layouts/Split/Split.js
+++ b/packages/patternfly-4/react-core/src/layouts/Split/Split.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import styles from '@patternfly/patternfly/layouts/Split/split.css';
-import { componentShape } from '../../internal/componentShape';
+import { componentShape } from '../../helpers/componentShape';
 import { GutterSize, getGutterModifier } from '../../styles/gutters';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/patternfly-4/react-core/src/layouts/Stack/Stack.js b/packages/patternfly-4/react-core/src/layouts/Stack/Stack.js
index ab97bee6714..b6f433d753a 100644
--- a/packages/patternfly-4/react-core/src/layouts/Stack/Stack.js
+++ b/packages/patternfly-4/react-core/src/layouts/Stack/Stack.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import styles from '@patternfly/patternfly/layouts/Stack/stack.css';
-import { componentShape } from '../../internal/componentShape';
+import { componentShape } from '../../helpers/componentShape';
 import { GutterSize, getGutterModifier } from '../../styles/gutters';
 import { css } from '@patternfly/react-styles';