diff --git a/app/javascript/gabsocial/components/autosuggest_input.js b/app/javascript/gabsocial/components/autosuggest_input.js
index c7d965b5..3417e8b1 100644
--- a/app/javascript/gabsocial/components/autosuggest_input.js
+++ b/app/javascript/gabsocial/components/autosuggest_input.js
@@ -3,7 +3,7 @@ import AutosuggestAccountContainer from '../features/compose/containers/autosugg
 import AutosuggestEmoji from './autosuggest_emoji';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
-import { isRtl } from '../rtl';
+import { isRtl } from '../utils/rtl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import classNames from 'classnames';
 import { List as ImmutableList } from 'immutable';
diff --git a/app/javascript/gabsocial/components/autosuggest_textarea.js b/app/javascript/gabsocial/components/autosuggest_textarea.js
index a892bfae..1857af68 100644
--- a/app/javascript/gabsocial/components/autosuggest_textarea.js
+++ b/app/javascript/gabsocial/components/autosuggest_textarea.js
@@ -3,7 +3,7 @@ import AutosuggestAccountContainer from '../features/compose/containers/autosugg
 import AutosuggestEmoji from './autosuggest_emoji';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
-import { isRtl } from '../rtl';
+import { isRtl } from '../utils/rtl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import Textarea from 'react-textarea-autosize';
 import classNames from 'classnames';
diff --git a/app/javascript/gabsocial/components/intersection_observer_article.js b/app/javascript/gabsocial/components/intersection_observer_article.js
index a85d664d..3deb185a 100644
--- a/app/javascript/gabsocial/components/intersection_observer_article.js
+++ b/app/javascript/gabsocial/components/intersection_observer_article.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import scheduleIdleTask from '../features/ui/util/schedule_idle_task';
-import getRectFromEntry from '../features/ui/util/get_rect_from_entry';
+import scheduleIdleTask from '../utils/schedule_idle_task';
+import getRectFromEntry from '../utils/get_rect_from_entry';
 import { is } from 'immutable';
 
 // Diff these props in the "rendered" state
diff --git a/app/javascript/gabsocial/components/media_gallery.js b/app/javascript/gabsocial/components/media_gallery.js
index 56618462..b3bb89ee 100644
--- a/app/javascript/gabsocial/components/media_gallery.js
+++ b/app/javascript/gabsocial/components/media_gallery.js
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import { is } from 'immutable';
 import IconButton from './icon_button';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-import { isIOS } from '../is_mobile';
+import { isIOS } from '../utils/is_mobile';
 import classNames from 'classnames';
 import { autoPlayGif, displayMedia } from '../initial_state';
 import { decode } from 'blurhash';
diff --git a/app/javascript/gabsocial/components/status_content.js b/app/javascript/gabsocial/components/status_content.js
index ca47143f..838bdf1d 100644
--- a/app/javascript/gabsocial/components/status_content.js
+++ b/app/javascript/gabsocial/components/status_content.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
-import { isRtl } from '../rtl';
+import { isRtl } from '../utils/rtl';
 import { FormattedMessage } from 'react-intl';
 import Permalink from './permalink';
 import classnames from 'classnames';
diff --git a/app/javascript/gabsocial/containers/dropdown_menu_container.js b/app/javascript/gabsocial/containers/dropdown_menu_container.js
index 73c8a1e5..ef52ceb2 100644
--- a/app/javascript/gabsocial/containers/dropdown_menu_container.js
+++ b/app/javascript/gabsocial/containers/dropdown_menu_container.js
@@ -2,7 +2,7 @@ import { openDropdownMenu, closeDropdownMenu } from '../actions/dropdown_menu';
 import { openModal, closeModal } from '../actions/modal';
 import { connect } from 'react-redux';
 import DropdownMenu from '../components/dropdown_menu';
-import { isUserTouching } from '../is_mobile';
+import { isUserTouching } from '../utils/is_mobile';
 
 const mapStateToProps = state => ({
   isModalOpen: state.get('modal').modalType === 'ACTIONS',
diff --git a/app/javascript/gabsocial/features/account_gallery/components/media_item.js b/app/javascript/gabsocial/features/account_gallery/components/media_item.js
index e416e507..f11d5c22 100644
--- a/app/javascript/gabsocial/features/account_gallery/components/media_item.js
+++ b/app/javascript/gabsocial/features/account_gallery/components/media_item.js
@@ -6,7 +6,7 @@ import Icon from 'gabsocial/components/icon';
 import { autoPlayGif, displayMedia } from 'gabsocial/initial_state';
 import classNames from 'classnames';
 import { decode } from 'blurhash';
-import { isIOS } from 'gabsocial/is_mobile';
+import { isIOS } from 'gabsocial/utils/is_mobile';
 
 export default class MediaItem extends ImmutablePureComponent {
 
diff --git a/app/javascript/gabsocial/features/compose/components/compose_form.js b/app/javascript/gabsocial/features/compose/components/compose_form.js
index 8dd548ae..a7c8e086 100644
--- a/app/javascript/gabsocial/features/compose/components/compose_form.js
+++ b/app/javascript/gabsocial/features/compose/components/compose_form.js
@@ -16,7 +16,7 @@ import EmojiPickerDropdown from '../containers/emoji_picker_dropdown_container';
 import PollFormContainer from '../containers/poll_form_container';
 import UploadFormContainer from '../containers/upload_form_container';
 import WarningContainer from '../containers/warning_container';
-import { isMobile } from '../../../is_mobile';
+import { isMobile } from '../../../utils/is_mobile';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { length } from 'stringz';
 import { countableText } from '../util/counter';
diff --git a/app/javascript/gabsocial/features/compose/components/reply_indicator.js b/app/javascript/gabsocial/features/compose/components/reply_indicator.js
index 27eb7892..951e5b1f 100644
--- a/app/javascript/gabsocial/features/compose/components/reply_indicator.js
+++ b/app/javascript/gabsocial/features/compose/components/reply_indicator.js
@@ -6,7 +6,7 @@ import IconButton from '../../../components/icon_button';
 import DisplayName from '../../../components/display_name';
 import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
-import { isRtl } from '../../../rtl';
+import { isRtl } from '../../../utils/rtl';
 import { NavLink } from 'react-router-dom';
 
 const messages = defineMessages({
diff --git a/app/javascript/gabsocial/features/compose/containers/privacy_dropdown_container.js b/app/javascript/gabsocial/features/compose/containers/privacy_dropdown_container.js
index 0ddf531d..9c278b07 100644
--- a/app/javascript/gabsocial/features/compose/containers/privacy_dropdown_container.js
+++ b/app/javascript/gabsocial/features/compose/containers/privacy_dropdown_container.js
@@ -2,7 +2,7 @@ import { connect } from 'react-redux';
 import PrivacyDropdown from '../components/privacy_dropdown';
 import { changeComposeVisibility } from '../../../actions/compose';
 import { openModal, closeModal } from '../../../actions/modal';
-import { isUserTouching } from '../../../is_mobile';
+import { isUserTouching } from '../../../utils/is_mobile';
 
 const mapStateToProps = state => ({
   isModalOpen: state.get('modal').modalType === 'ACTIONS',
diff --git a/app/javascript/gabsocial/features/status/components/detailed_status.js b/app/javascript/gabsocial/features/status/components/detailed_status.js
index 97ec6648..9fac7ef0 100644
--- a/app/javascript/gabsocial/features/status/components/detailed_status.js
+++ b/app/javascript/gabsocial/features/status/components/detailed_status.js
@@ -10,7 +10,7 @@ import { FormattedDate, FormattedNumber } from 'react-intl';
 import Card from './card';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import Video from '../../video';
-import scheduleIdleTask from '../../ui/util/schedule_idle_task';
+import scheduleIdleTask from '../../../utils/schedule_idle_task';
 import classNames from 'classnames';
 import Icon from 'gabsocial/components/icon';
 import PollContainer from 'gabsocial/containers/poll_container';
diff --git a/app/javascript/gabsocial/features/status/index.js b/app/javascript/gabsocial/features/status/index.js
index e88ab4c1..20420ee1 100644
--- a/app/javascript/gabsocial/features/status/index.js
+++ b/app/javascript/gabsocial/features/status/index.js
@@ -40,7 +40,7 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { HotKeys } from 'react-hotkeys';
 import { boostModal, deleteModal, me } from '../../initial_state';
-import { attachFullscreenListener, detachFullscreenListener, isFullscreen } from '../ui/util/fullscreen';
+import { attachFullscreenListener, detachFullscreenListener, isFullscreen } from '../../utils/fullscreen';
 import { textForScreenReader, defaultMediaVisibility } from '../../components/status';
 import Icon from 'gabsocial/components/icon';
 
diff --git a/app/javascript/gabsocial/features/ui/components/column.js b/app/javascript/gabsocial/features/ui/components/column.js
index 8a990b4c..4c7b837e 100644
--- a/app/javascript/gabsocial/features/ui/components/column.js
+++ b/app/javascript/gabsocial/features/ui/components/column.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import ColumnHeader from './column_header';
 import PropTypes from 'prop-types';
-import { isMobile } from '../../../is_mobile';
+import { isMobile } from '../../../utils/is_mobile';
 import ColumnBackButton from '../../../components/column_back_button';
 import ColumnBackButtonSlim from '../../../components/column_back_button_slim';
 
diff --git a/app/javascript/gabsocial/features/ui/components/tabs_bar.js b/app/javascript/gabsocial/features/ui/components/tabs_bar.js
index fd0ba2a6..1188032c 100644
--- a/app/javascript/gabsocial/features/ui/components/tabs_bar.js
+++ b/app/javascript/gabsocial/features/ui/components/tabs_bar.js
@@ -4,7 +4,7 @@ import { NavLink, withRouter } from 'react-router-dom';
 import { FormattedMessage, injectIntl } from 'react-intl';
 import { debounce } from 'lodash';
 import { connect } from 'react-redux';
-import { isUserTouching } from '../../../is_mobile';
+import { isUserTouching } from '../../../utils/is_mobile';
 import { me } from '../../../initial_state';
 import { Link } from 'react-router-dom';
 import NotificationsCounterIcon from './notifications_counter_icon';
diff --git a/app/javascript/gabsocial/features/ui/index.js b/app/javascript/gabsocial/features/ui/index.js
index 7aa604b1..1a834651 100644
--- a/app/javascript/gabsocial/features/ui/index.js
+++ b/app/javascript/gabsocial/features/ui/index.js
@@ -10,7 +10,7 @@ import PropTypes from 'prop-types';
 import NotificationsContainer from './containers/notifications_container';
 import LoadingBarContainer from './containers/loading_bar_container';
 import ModalContainer from './containers/modal_container';
-import { isMobile } from '../../is_mobile';
+import { isMobile } from '../../utils/is_mobile';
 import { debounce } from 'lodash';
 import { uploadCompose, resetCompose } from '../../actions/compose';
 import { expandHomeTimeline } from '../../actions/timelines';
diff --git a/app/javascript/gabsocial/features/video/index.js b/app/javascript/gabsocial/features/video/index.js
index 64a24cbe..ffebd3b6 100644
--- a/app/javascript/gabsocial/features/video/index.js
+++ b/app/javascript/gabsocial/features/video/index.js
@@ -4,7 +4,7 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import { fromJS, is } from 'immutable';
 import { throttle } from 'lodash';
 import classNames from 'classnames';
-import { isFullscreen, requestFullscreen, exitFullscreen } from '../ui/util/fullscreen';
+import { isFullscreen, requestFullscreen, exitFullscreen } from '../../utils/fullscreen';
 import { displayMedia } from '../../initial_state';
 import Icon from 'gabsocial/components/icon';
 import { decode } from 'blurhash';
diff --git a/app/javascript/gabsocial/reducers/compose.js b/app/javascript/gabsocial/reducers/compose.js
index 134ccdcd..bdbf7a6c 100644
--- a/app/javascript/gabsocial/reducers/compose.js
+++ b/app/javascript/gabsocial/reducers/compose.js
@@ -40,7 +40,7 @@ import { TIMELINE_DELETE } from '../actions/timelines';
 import { STORE_HYDRATE } from '../actions/store';
 import { REDRAFT } from '../actions/statuses';
 import { Map as ImmutableMap, List as ImmutableList, OrderedSet as ImmutableOrderedSet, fromJS } from 'immutable';
-import uuid from '../uuid';
+import uuid from '../utils/uuid';
 import { me } from '../initial_state';
 import { unescapeHTML } from '../utils/html';
 
diff --git a/app/javascript/gabsocial/reducers/contexts.js b/app/javascript/gabsocial/reducers/contexts.js
index 4c2d6cc8..bcc42ea4 100644
--- a/app/javascript/gabsocial/reducers/contexts.js
+++ b/app/javascript/gabsocial/reducers/contexts.js
@@ -5,7 +5,7 @@ import {
 import { CONTEXT_FETCH_SUCCESS } from '../actions/statuses';
 import { TIMELINE_DELETE, TIMELINE_UPDATE } from '../actions/timelines';
 import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
-import compareId from '../compare_id';
+import compareId from '../utils/compare_id';
 
 const initialState = ImmutableMap({
   inReplyTos: ImmutableMap(),
diff --git a/app/javascript/gabsocial/reducers/conversations.js b/app/javascript/gabsocial/reducers/conversations.js
index 9564bffc..e45a56da 100644
--- a/app/javascript/gabsocial/reducers/conversations.js
+++ b/app/javascript/gabsocial/reducers/conversations.js
@@ -8,7 +8,7 @@ import {
   CONVERSATIONS_UPDATE,
   CONVERSATIONS_READ,
 } from '../actions/conversations';
-import compareId from '../compare_id';
+import compareId from '../utils/compare_id';
 
 const initialState = ImmutableMap({
   items: ImmutableList(),
diff --git a/app/javascript/gabsocial/reducers/notifications.js b/app/javascript/gabsocial/reducers/notifications.js
index 7531165f..2c9d520b 100644
--- a/app/javascript/gabsocial/reducers/notifications.js
+++ b/app/javascript/gabsocial/reducers/notifications.js
@@ -16,7 +16,7 @@ import {
 } from '../actions/accounts';
 import { TIMELINE_DELETE, TIMELINE_DISCONNECT } from '../actions/timelines';
 import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
-import compareId from '../compare_id';
+import compareId from '../utils/compare_id';
 
 const initialState = ImmutableMap({
   items: ImmutableList(),
diff --git a/app/javascript/gabsocial/reducers/settings.js b/app/javascript/gabsocial/reducers/settings.js
index 99f0c718..690b764f 100644
--- a/app/javascript/gabsocial/reducers/settings.js
+++ b/app/javascript/gabsocial/reducers/settings.js
@@ -4,7 +4,7 @@ import { STORE_HYDRATE } from '../actions/store';
 import { EMOJI_USE } from '../actions/emojis';
 import { LIST_DELETE_SUCCESS, LIST_FETCH_FAIL } from '../actions/lists';
 import { Map as ImmutableMap, fromJS } from 'immutable';
-import uuid from '../uuid';
+import uuid from '../utils/uuid';
 
 const initialState = ImmutableMap({
   saved: true,
diff --git a/app/javascript/gabsocial/reducers/timelines.js b/app/javascript/gabsocial/reducers/timelines.js
index a088aecb..50ee047f 100644
--- a/app/javascript/gabsocial/reducers/timelines.js
+++ b/app/javascript/gabsocial/reducers/timelines.js
@@ -18,7 +18,7 @@ import {
   ACCOUNT_UNFOLLOW_SUCCESS,
 } from '../actions/accounts';
 import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
-import compareId from '../compare_id';
+import compareId from '../utils/compare_id';
 import { GROUP_REMOVE_STATUS_SUCCESS } from '../actions/groups';
 
 const initialState = ImmutableMap();
diff --git a/app/javascript/gabsocial/compare_id.js b/app/javascript/gabsocial/utils/compare_id.js
similarity index 100%
rename from app/javascript/gabsocial/compare_id.js
rename to app/javascript/gabsocial/utils/compare_id.js
diff --git a/app/javascript/gabsocial/features/ui/util/fullscreen.js b/app/javascript/gabsocial/utils/fullscreen.js
similarity index 100%
rename from app/javascript/gabsocial/features/ui/util/fullscreen.js
rename to app/javascript/gabsocial/utils/fullscreen.js
diff --git a/app/javascript/gabsocial/features/ui/util/get_rect_from_entry.js b/app/javascript/gabsocial/utils/get_rect_from_entry.js
similarity index 100%
rename from app/javascript/gabsocial/features/ui/util/get_rect_from_entry.js
rename to app/javascript/gabsocial/utils/get_rect_from_entry.js
diff --git a/app/javascript/gabsocial/is_mobile.js b/app/javascript/gabsocial/utils/is_mobile.js
similarity index 100%
rename from app/javascript/gabsocial/is_mobile.js
rename to app/javascript/gabsocial/utils/is_mobile.js
diff --git a/app/javascript/gabsocial/rtl.js b/app/javascript/gabsocial/utils/rtl.js
similarity index 100%
rename from app/javascript/gabsocial/rtl.js
rename to app/javascript/gabsocial/utils/rtl.js
diff --git a/app/javascript/gabsocial/features/ui/util/schedule_idle_task.js b/app/javascript/gabsocial/utils/schedule_idle_task.js
similarity index 100%
rename from app/javascript/gabsocial/features/ui/util/schedule_idle_task.js
rename to app/javascript/gabsocial/utils/schedule_idle_task.js
diff --git a/app/javascript/gabsocial/uuid.js b/app/javascript/gabsocial/utils/uuid.js
similarity index 100%
rename from app/javascript/gabsocial/uuid.js
rename to app/javascript/gabsocial/utils/uuid.js