Remove redundant '_utils' suffix in util file names

js/app.js

@@ -12,9 +12,9 @@ import history from './history';
 
 import AppConstants from './constants/application_constants';
 
-import { getDefaultSubdomainSettings, getSubdomainSettings } from './utils/constants_utils';
+import { getDefaultSubdomainSettings, getSubdomainSettings } from './utils/constants';
-import { initLogging } from './utils/error_utils';
+import { initLogging } from './utils/error';
-import { getSubdomain } from './utils/general_utils';
+import { getSubdomain } from './utils/general';
 import requests from './utils/requests';
 
 

js/components/app_base.js

@@ -9,7 +9,7 @@ import WhitelabelStore from '../stores/whitelabel_store';
 import GlobalNotification from './global_notification';
 import { currentUserShape, locationShape, whitelabelShape } from './prop_types';
 
-import { mergeOptions } from '../utils/general_utils';
+import { mergeOptions } from '../utils/general';
 
 
 export default function AppBase(App) {

js/components/ascribe_accordion_list/accordion_list.js

@@ -3,7 +3,7 @@
 import React from 'react';
 import Link from 'react-router/es6/Link';
 
-import { getLangText } from '../../utils/lang_utils';
+import { getLangText } from '../../utils/lang';
 
 
 let AccordionList = React.createClass({

js/components/ascribe_accordion_list/accordion_list_item_edition_widget.js

@@ -8,13 +8,11 @@ import EditionListStore from '../../stores/edition_list_store';
 
 import PieceListStore from '../../stores/piece_list_store';
 
-import Button from 'react-bootstrap/lib/Button';
-
 import CreateEditionsButton from '../ascribe_buttons/create_editions_button';
 import AscribeSpinner from '../ascribe_spinner';
 
-import { mergeOptions } from '../../utils/general_utils';
+import { mergeOptions } from '../../utils/general';
-import { getLangText } from '../../utils/lang_utils';
+import { getLangText } from '../../utils/lang';
 
 
 let AccordionListItemEditionWidget = React.createClass({

js/components/ascribe_accordion_list/accordion_list_item_piece.js

@@ -5,7 +5,7 @@ import React from 'react';
 import AccordionListItem from './accordion_list_item';
 import AccordionListItemThumbnailPlacholder from './accordion_list_item_thumbnail_placeholder';
 
-import { getLangText } from '../../utils/lang_utils';
+import { getLangText } from '../../utils/lang';
 
 
 let AccordionListItemPiece = React.createClass({

js/components/ascribe_accordion_list/accordion_list_item_table_editions.js

@@ -16,8 +16,8 @@ import TableItemCheckbox from '../ascribe_table/table_item_checkbox';
 import TableItemAclFiltered from '../ascribe_table/table_item_acl_filtered';
 import AscribeSpinner from '../ascribe_spinner';
 
-import { getLangText } from '../../utils/lang_utils';
+import { getLangText } from '../../utils/lang';
-import { mergeOptions } from '../../utils/general_utils';
+import { mergeOptions } from '../../utils/general';
 
 
 let AccordionListItemTableEditions = React.createClass({

js/components/ascribe_accordion_list/accordion_list_item_wallet.js

@@ -23,8 +23,8 @@ import AclProxy from '../acl_proxy';
 import withContext from '../context/with_context';
 import { whitelabelShape } from '../prop_types';
 
-import { mergeOptions } from '../../utils/general_utils';
+import { mergeOptions } from '../../utils/general';
-import { getLangText } from '../../utils/lang_utils';
+import { getLangText } from '../../utils/lang';
 
 
 let AccordionListItemWallet = React.createClass({

js/components/ascribe_buttons/acl_button_list.js

@@ -5,11 +5,10 @@ import React from 'react';
 import ConsignButton from './acls/consign_button';
 import EmailButton from './acls/email_button';
 import LoanButton from './acls/loan_button';
-import LoanRequestButton from './acls/loan_request_button';
 import TransferButton from './acls/transfer_button';
 import UnconsignButton from './acls/unconsign_button';
 
-import { selectFromObject } from '../../utils/general_utils';
+import { selectFromObject } from '../../utils/general';
 
 let AclButtonList = React.createClass({
     propTypes: {

js/components/ascribe_buttons/acl_information.js

@@ -4,8 +4,8 @@ import React from 'react';
 import classnames from 'classnames';
 
 import { AclInformationText } from '../../constants/acl_information_text';
-import { replaceSubstringAtIndex, sanitize, intersectLists } from '../../utils/general_utils';
+import { replaceSubstringAtIndex, sanitize, intersectLists } from '../../utils/general';
-import { getLangText } from '../../utils/lang_utils';
+import { getLangText } from '../../utils/lang';
 
 
 let AclInformation = React.createClass({

js/components/ascribe_buttons/acls/consign_button.js

@@ -1,10 +1,8 @@
 'use strict';
 
-import React from 'react';
-
 import AclButton from './acl_button';
 
-import { getLangText } from '../../../utils/lang_utils';
+import { getLangText } from '../../../utils/lang';
 
 export default AclButton({
     action: 'acl_consign',

js/components/ascribe_buttons/acls/email_button.js

@@ -1,10 +1,8 @@
 'use strict';
 
-import React from 'react';
-
 import AclButton from './acl_button';
 
-import { getLangText } from '../../../utils/lang_utils';
+import { getLangText } from '../../../utils/lang';
 
 export default AclButton({
     action: 'acl_share',

js/components/ascribe_buttons/acls/loan_button.js

@@ -1,10 +1,8 @@
 'use strict';
 
-import React from 'react';
-
 import AclButton from './acl_button';
 
-import { getLangText } from '../../../utils/lang_utils';
+import { getLangText } from '../../../utils/lang';
 
 export default AclButton({
     action: 'acl_loan',

js/components/ascribe_buttons/acls/loan_request_button.js

@@ -1,10 +1,8 @@
 'use strict';
 
-import React from 'react';
-
 import AclButton from './acl_button';
 
-import { getLangText } from '../../../utils/lang_utils';
+import { getLangText } from '../../../utils/lang';
 
 export default AclButton({
     action: 'acl_loan_request',

js/components/ascribe_buttons/acls/transfer_button.js

@@ -1,10 +1,8 @@
 'use strict';
 
-import React from 'react';
-
 import AclButton from './acl_button';
 
-import { getLangText } from '../../../utils/lang_utils';
+import { getLangText } from '../../../utils/lang';
 
 export default AclButton({
     action: 'acl_transfer',

js/components/ascribe_buttons/acls/unconsign_button.js

@@ -1,10 +1,8 @@
 'use strict';
 
-import React from 'react';
-
 import AclButton from './acl_button';
 
-import { getLangText } from '../../../utils/lang_utils';
+import { getLangText } from '../../../utils/lang';
 
 export default AclButton({
     action: 'acl_unconsign',

js/components/ascribe_buttons/create_editions_button.js

@@ -1,15 +1,15 @@
 'use strict';
 
 import React from 'react';
+import classNames from 'classnames';
 
 import EditionListActions from '../../actions/edition_list_actions';
 import EditionListStore from '../../stores/edition_list_store';
 
 import AscribeSpinner from '../ascribe_spinner';
 
-import { getLangText } from '../../utils/lang_utils';
+import { getLangText } from '../../utils/lang';
 
-import classNames from 'classnames';
 
 let CreateEditionsButton = React.createClass({
     propTypes: {

js/components/ascribe_buttons/delete_button.js

@@ -12,8 +12,8 @@ import PieceRemoveFromCollectionForm from '../ascribe_forms/form_remove_piece_fr
 
 import ModalWrapper from '../ascribe_modal/modal_wrapper';
 
-import { getAvailableAcls } from '../../utils/acl_utils';
+import { getAvailableAcls } from '../../utils/acl';
-import { getLangText } from '../../utils/lang_utils.js';
+import { getLangText } from '../../utils/lang.js';
 
 
 let DeleteButton = React.createClass({

js/components/ascribe_buttons/s3_download_button.js

@@ -2,14 +2,14 @@
 
 import React from 'react';
 
-import S3Fetcher from '../../fetchers/s3_fetcher';
-
 import Glyphicon from 'react-bootstrap/lib/Glyphicon';
 
+import S3Fetcher from '../../fetchers/s3_fetcher';
+
 import AppConstants from '../../constants/application_constants';
 
-import { getLangText } from '../../utils/lang_utils';
+import { getLangText } from '../../utils/lang';
-import { queryParamsToArgs } from '../../utils/url_utils';
+import { queryParamsToArgs } from '../../utils/url';
 
 
 const { string } = React.PropTypes;

js/components/ascribe_buttons/unconsign_request_button.js

@@ -10,7 +10,7 @@ import UnConsignRequestForm from '../ascribe_forms/form_unconsign_request';
 import withContext from '../context/with_context';
 import { currentUserShape } from '../prop_types';
 
-import { getLangText } from '../../utils/lang_utils';
+import { getLangText } from '../../utils/lang';
 import ApiUrls from '../../constants/api_urls';
 
 

js/components/ascribe_detail/edition.js

@@ -27,7 +27,7 @@ import withContext from '../context/with_context';
 import ApiUrls from '../../constants/api_urls';
 import AscribeSpinner from '../ascribe_spinner';
 
-import { getLangText } from '../../utils/lang_utils';
+import { getLangText } from '../../utils/lang';
 
 
 /**

js/components/ascribe_detail/edition_action_panel.js

@@ -28,7 +28,7 @@ import { routerShape } from '../prop_types';
 
 import ApiUrls from '../../constants/api_urls';
 
-import { getLangText } from '../../utils/lang_utils';
+import { getLangText } from '../../utils/lang';
 
 /*
     A component that handles all the actions inside of the edition detail

js/components/ascribe_detail/edition_container.js

@@ -12,8 +12,8 @@ import Edition from './edition';
 
 import AscribeSpinner from '../ascribe_spinner';
 
-import { getLangText } from '../../utils/lang_utils';
+import { getLangText } from '../../utils/lang';
-import { setDocumentTitle } from '../../utils/dom_utils';
+import { setDocumentTitle } from '../../utils/dom';
 
 
 /**

js/components/ascribe_detail/further_details.js

@@ -15,7 +15,7 @@ import PieceExtraDataForm from './../ascribe_forms/form_piece_extradata';
 
 import { formSubmissionValidation } from '../ascribe_uploader/react_s3_fine_uploader_utils';
 
-import { getLangText } from '../../utils/lang_utils';
+import { getLangText } from '../../utils/lang';
 
 
 let FurtherDetails = React.createClass({

js/components/ascribe_detail/further_details_fileuploader.js

@@ -10,8 +10,8 @@ import ApiUrls from '../../constants/api_urls';
 import AppConstants from '../../constants/application_constants';
 import { validationTypes } from '../../constants/uploader_constants';
 
-import { getCookie } from '../../utils/fetch_api_utils';
+import { getCookie } from '../../utils/fetch_api';
-import { getLangText } from '../../utils/lang_utils';
+import { getLangText } from '../../utils/lang';
 
 
 const { func, bool, number, object, string, arrayOf } = React.PropTypes;

js/components/ascribe_detail/history_iterator.js

@@ -5,7 +5,7 @@ import React from 'react';
 import Form from '../ascribe_forms/form';
 import Property from '../ascribe_forms/property';
 
-import { replaceSubstringAtIndex } from '../../utils/general_utils';
+import { replaceSubstringAtIndex } from '../../utils/general';
 
 
 let HistoryIterator = React.createClass({

js/components/ascribe_detail/media_container.js

@@ -22,8 +22,8 @@ import { currentUserShape } from '../prop_types';
 
 import AppConstants from '../../constants/application_constants';
 
-import { extractFileExtensionFromUrl } from '../../utils/file_utils';
+import { extractFileExtensionFromUrl } from '../../utils/file';
-import { getLangText } from '../../utils/lang_utils';
+import { getLangText } from '../../utils/lang';
 
 
 const EMBED_IFRAME_HEIGHT = {

js/components/ascribe_detail/note.js

@@ -11,7 +11,7 @@ import InputTextAreaToggable from '../ascribe_forms/input_textarea_toggable';
 
 import withContext from '../context/with_context';
 
-import { getLangText } from '../../utils/lang_utils';
+import { getLangText } from '../../utils/lang';
 
 let Note = React.createClass({
     propTypes: {

js/components/ascribe_detail/piece_container.js

@@ -41,9 +41,9 @@ import { routerShape } from '../prop_types';
 
 import ApiUrls from '../../constants/api_urls';
 
-import { setDocumentTitle } from '../../utils/dom_utils';
+import { setDocumentTitle } from '../../utils/dom';
-import { mergeOptions } from '../../utils/general_utils';
+import { mergeOptions } from '../../utils/general';
-import { getLangText } from '../../utils/lang_utils';
+import { getLangText } from '../../utils/lang';
 
 /**
  * This is the component that implements resource/data specific functionality

js/components/ascribe_forms/acl_form_factory.js

@@ -18,7 +18,7 @@ import { currentUserShape } from '../prop_types';
 import AppConstants from '../../constants/application_constants';
 import ApiUrls from '../../constants/api_urls';
 
-import { getAclFormMessage, getAclFormDataId } from '../../utils/form_utils';
+import { getAclFormMessage, getAclFormDataId } from '../../utils/form';
 
 let AclFormFactory = React.createClass({
     propTypes: {

js/components/ascribe_forms/create_editions_form.js

@@ -11,7 +11,7 @@ import GlobalNotificationActions from '../../actions/global_notification_actions
 import AscribeSpinner from '../ascribe_spinner';
 import ApiUrls from '../../constants/api_urls';
 
-import { getLangText } from '../../utils/lang_utils';
+import { getLangText } from '../../utils/lang';
 
 let CreateEditionsForm = React.createClass({
     propTypes: {

js/components/ascribe_forms/form.js

@@ -13,8 +13,8 @@ import GlobalNotificationActions from '../../actions/global_notification_actions
 
 import requests from '../../utils/requests';
 
-import { getLangText } from '../../utils/lang_utils';
+import { sanitize } from '../../utils/general';
-import { sanitize } from '../../utils/general_utils';
+import { getLangText } from '../../utils/lang';
 
 
 let Form = React.createClass({

js/components/ascribe_forms/form_consign.js

@@ -15,7 +15,7 @@ import AscribeSpinner from '../ascribe_spinner';
 
 import AclInformation from '../ascribe_buttons/acl_information';
 
-import { getLangText } from '../../utils/lang_utils.js';
+import { getLangText } from '../../utils/lang';
 
 let ConsignForm = React.createClass({
     propTypes: {

js/components/ascribe_forms/form_copyright_association.js

@@ -14,7 +14,7 @@ import { currentUserShape } from '../prop_types';
 import ApiUrls from '../../constants/api_urls';
 import AppConstants from '../../constants/application_constants';
 
-import { getLangText } from '../../utils/lang_utils';
+import { getLangText } from '../../utils/lang';
 
 
 const { bool } = React.PropTypes;

js/components/ascribe_forms/form_create_contract.js

@@ -16,7 +16,7 @@ import ApiUrls from '../../constants/api_urls';
 import AppConstants from '../../constants/application_constants';
 import { validationTypes } from '../../constants/uploader_constants';
 
-import { getLangText } from '../../utils/lang_utils';
+import { getLangText } from '../../utils/lang';
 import { formSubmissionValidation } from '../ascribe_uploader/react_s3_fine_uploader_utils';
 
 

js/components/ascribe_forms/form_delete_edition.js

@@ -4,11 +4,14 @@ import React from 'react';
 
 import Form from './form';
 
-import ApiUrls from '../../constants/api_urls';
+import AclInformation from '../ascribe_buttons/acl_information';
+
 import AscribeSpinner from '../ascribe_spinner';
 
-import { getLangText } from '../../utils/lang_utils';
+import ApiUrls from '../../constants/api_urls';
-import AclInformation from '../ascribe_buttons/acl_information';
+
+import { getLangText } from '../../utils/lang';
+
 
 let EditionDeleteForm = React.createClass({
 

js/components/ascribe_forms/form_delete_piece.js

@@ -6,10 +6,11 @@ import Form from '../ascribe_forms/form';
 
 import AclInformation from '../ascribe_buttons/acl_information';
 
-import ApiUrls from '../../constants/api_urls';
 import AscribeSpinner from '../ascribe_spinner';
 
-import { getLangText } from '../../utils/lang_utils';
+import ApiUrls from '../../constants/api_urls';
+
+import { getLangText } from '../../utils/lang';
 
 
 let PieceDeleteForm = React.createClass({

js/components/ascribe_forms/form_loan.js

@@ -5,21 +5,17 @@ import classnames from 'classnames';
 
 import Button from 'react-bootstrap/lib/Button';
 
-import ContractAgreementListStore from '../../stores/contract_agreement_list_store';
-
 import Form from './form';
 import Property from './property';
-
 import InputDate from './input_date';
 import InputTextAreaToggable from './input_textarea_toggable';
 import InputContractAgreementCheckbox from './input_contract_agreement_checkbox';
 
-import AscribeSpinner from '../ascribe_spinner';
-
 import AclInformation from '../ascribe_buttons/acl_information';
 
-import { getLangText } from '../../utils/lang_utils';
+import AscribeSpinner from '../ascribe_spinner';
-import { mergeOptions } from '../../utils/general_utils';
+
+import { getLangText } from '../../utils/lang';
 
 
 let LoanForm = React.createClass({

js/components/ascribe_forms/form_loan_request_answer.js

@@ -3,14 +3,10 @@
 import React from 'react';
 import Moment from 'moment';
 
-import LoanForm from './form_loan';
-
 import OwnershipActions from '../../actions/ownership_actions';
 import OwnershipStore from '../../stores/ownership_store';
 
-import AppConstants from '../../constants/application_constants';
+import LoanForm from './form_loan';
-
-import { getLangText } from '../../utils/lang_utils';
 
 
 let LoanRequestAnswerForm = React.createClass({

js/components/ascribe_forms/form_login.js

@@ -16,7 +16,7 @@ import { locationShape } from '../prop_types';
 
 import ApiUrls from '../../constants/api_urls';
 
-import { getLangText } from '../../utils/lang_utils';
+import { getLangText } from '../../utils/lang';
 
 
 let LoginForm = React.createClass({

js/components/ascribe_forms/form_piece_extradata.js

@@ -2,15 +2,16 @@
 
 import React from 'react';
 
-import requests from '../../utils/requests';
-import { getLangText } from '../../utils/lang_utils.js';
-
-import ApiUrls from '../../constants/api_urls';
-
 import Form from './form';
 import Property from './property';
 import InputTextAreaToggable from './input_textarea_toggable';
 
+import ApiUrls from '../../constants/api_urls';
+
+import requests from '../../utils/requests';
+import { getLangText } from '../../utils/lang.js';
+
+
 let PieceExtraDataForm = React.createClass({
     propTypes: {
         name: React.PropTypes.string.isRequired,

js/components/ascribe_forms/form_register_piece.js

@@ -19,7 +19,7 @@ import AppConstants from '../../constants/application_constants';
 import { validationParts, validationTypes } from '../../constants/uploader_constants';
 
 import { FileStatus, formSubmissionValidation } from '../ascribe_uploader/react_s3_fine_uploader_utils';
-import { getLangText } from '../../utils/lang_utils';
+import { getLangText } from '../../utils/lang';
 
 
 let RegisterPieceForm = React.createClass({

js/components/ascribe_forms/form_remove_editions_from_collection.js

@@ -4,10 +4,11 @@ import React from 'react';
 
 import Form from './form';
 
-import ApiUrls from '../../constants/api_urls';
 import AscribeSpinner from '../ascribe_spinner';
 
-import { getLangText } from '../../utils/lang_utils';
+import ApiUrls from '../../constants/api_urls';
+
+import { getLangText } from '../../utils/lang';
 
 let EditionRemoveFromCollectionForm = React.createClass({
     propTypes: {

js/components/ascribe_forms/form_remove_piece_from_collection.js

@@ -4,10 +4,11 @@ import React from 'react';
 
 import Form from './form';
 
-import ApiUrls from '../../constants/api_urls';
 import AscribeSpinner from '../ascribe_spinner';
 
-import { getLangText } from '../../utils/lang_utils';
+import ApiUrls from '../../constants/api_urls';
+
+import { getLangText } from '../../utils/lang';
 
 
 let PieceRemoveFromCollectionForm = React.createClass({

js/components/ascribe_forms/form_request_action.js

@@ -16,8 +16,8 @@ import GlobalNotificationActions from '../../actions/global_notification_actions
 
 import ApiUrls from '../../constants/api_urls';
 
-import { getAclFormDataId } from '../../utils/form_utils';
+import { getAclFormDataId } from '../../utils/form';
-import { getLangText } from '../../utils/lang_utils.js';
+import { getLangText } from '../../utils/lang.js';
 
 let RequestActionForm = React.createClass({
     propTypes: {

js/components/ascribe_forms/form_send_contract_agreement.js

@@ -18,8 +18,8 @@ import { routerShape } from '../prop_types';
 
 import ApiUrls from '../../constants/api_urls';
 
-import { getLangText } from '../../utils/lang_utils';
+import { mergeOptions } from '../../utils/general';
-import { mergeOptions } from '../../utils/general_utils';
+import { getLangText } from '../../utils/lang';
 
 
 const SendContractAgreementForm = React.createClass({

js/components/ascribe_forms/form_share_email.js

@@ -2,17 +2,17 @@
 
 import React from 'react';
 
+import Button from 'react-bootstrap/lib/Button';
+
 import Form from './form';
 import Property from './property';
 import InputTextAreaToggable from './input_textarea_toggable';
 
-import Button from 'react-bootstrap/lib/Button';
-
 import AclInformation from '../ascribe_buttons/acl_information';
 
 import AscribeSpinner from '../ascribe_spinner';
 
-import { getLangText } from '../../utils/lang_utils.js';
+import { getLangText } from '../../utils/lang.js';
 
 
 let ShareForm = React.createClass({

js/components/ascribe_forms/form_signup.js

@@ -17,7 +17,7 @@ import { locationShape } from '../prop_types';
 
 import ApiUrls from '../../constants/api_urls';
 
-import { getLangText } from '../../utils/lang_utils';
+import { getLangText } from '../../utils/lang';
 
 
 let SignupForm = React.createClass({

js/components/ascribe_forms/form_transfer.js

@@ -13,7 +13,7 @@ import AclInformation from '../ascribe_buttons/acl_information';
 
 import AscribeSpinner from '../ascribe_spinner';
 
-import { getLangText } from '../../utils/lang_utils.js';
+import { getLangText } from '../../utils/lang.js';
 
 
 let TransferForm = React.createClass({

js/components/ascribe_forms/form_unconsign.js

@@ -9,7 +9,8 @@ import Property from './property';
 import InputTextAreaToggable from './input_textarea_toggable';
 
 import AscribeSpinner from '../ascribe_spinner';
-import { getLangText } from '../../utils/lang_utils.js';
+
+import { getLangText } from '../../utils/lang.js';
 
 
 let UnConsignForm = React.createClass({

js/components/ascribe_forms/form_unconsign_request.js

@@ -9,7 +9,8 @@ import Property from './property';
 import InputTextAreaToggable from './input_textarea_toggable';
 
 import AscribeSpinner from '../ascribe_spinner';
-import { getLangText } from '../../utils/lang_utils.js';
+
+import { getLangText } from '../../utils/lang.js';
 
 
 let UnConsignRequestForm = React.createClass({

js/components/ascribe_forms/input_contract_agreement_checkbox.js

@@ -8,9 +8,9 @@ import InputCheckbox from './input_checkbox';
 import ContractAgreementListStore from '../../stores/contract_agreement_list_store';
 import ContractAgreementListActions from '../../actions/contract_agreement_list_actions';
 
-import { getLangText } from '../../utils/lang_utils';
+import { mergeOptions } from '../../utils/general';
-import { mergeOptions } from '../../utils/general_utils';
+import { getLangText } from '../../utils/lang';
-import { isEmail } from '../../utils/regex_utils';
+import { isEmail } from '../../utils/regex';
 
 
 const InputContractAgreementCheckbox = React.createClass({

js/components/ascribe_forms/input_fineuploader.js

@@ -7,10 +7,10 @@ import FileDragAndDrop from '../ascribe_uploader/ascribe_file_drag_and_drop/file
 
 import AppConstants from '../../constants/application_constants';
 
-import { getCookie } from '../../utils/fetch_api_utils';
+import { getCookie } from '../../utils/fetch_api';
 
 
-const { func, bool, shape, string, number, element, oneOf, oneOfType, arrayOf } = React.PropTypes;
+const { func, bool, oneOf } = React.PropTypes;
 
 const InputFineUploader = React.createClass({
     propTypes: {

js/components/ascribe_forms/input_textarea_toggable.js

@@ -4,7 +4,7 @@ import React from 'react';
 
 import TextareaAutosize from 'react-textarea-autosize';
 
-import { anchorize } from '../../utils/dom_utils';
+import { anchorize } from '../../utils/dom';
 
 
 let InputTextAreaToggable = React.createClass({

js/components/ascribe_media/media_player.js

@@ -1,19 +1,15 @@
 'use strict';
 
 import React from 'react';
-import Q from 'q';
 
 import Panel from 'react-bootstrap/lib/Panel';
 
-import AppConstants from '../../constants/application_constants';
-
 import audiojs from '../../third_party/imports/audiojs';
 import shmui from '../../third_party/imports/shmui';
 import videojs from '../../third_party/imports/videojs';
 
-import { escapeHTML } from '../../utils/general_utils';
+import { extractFileExtensionFromUrl } from '../../utils/file';
-import { extractFileExtensionFromUrl } from '../../utils/file_utils';
+import { escapeHTML } from '../../utils/general';
-import { InjectInHeadUtils } from '../../utils/inject_utils';
 
 
 /**

js/components/ascribe_pagination/pagination_button.js

@@ -4,7 +4,7 @@ import React from 'react';
 import Link from 'react-router/es6/Link';
 
 import Glyphicon from 'react-bootstrap/lib/Glyphicon';
-import { getLangText } from '../../utils/lang_utils';
+import { getLangText } from '../../utils/lang';
 
 
 let PaginationButton = React.createClass({

js/components/ascribe_piece_list_bulk_modal/piece_list_bulk_modal.js

@@ -2,13 +2,12 @@
 
 import React from 'react';
 
-import { mergeOptions } from '../../utils/general_utils';
-
 import EditionListActions from '../../actions/edition_list_actions';
 
 import PieceListBulkModalSelectedEditionsWidget from './piece_list_bulk_modal_selected_editions_widget';
 
-import { getLangText } from '../../utils/lang_utils.js';
+import { getLangText } from '../../utils/lang.js';
+
 
 let PieceListBulkModal = React.createClass({
     propTypes: {

js/components/ascribe_piece_list_bulk_modal/piece_list_bulk_modal_selected_editions_widget.js

@@ -1,7 +1,8 @@
 'use strict';
 
 import React from 'react';
-import { getLangText } from '../../utils/lang_utils.js';
+
+import { getLangText } from '../../utils/lang.js';
 
 let PieceListBulkModalSelectedEditionsWidget = React.createClass({
     propTypes: {

js/components/ascribe_piece_list_toolbar/piece_list_toolbar_filter_widget.js

@@ -4,7 +4,7 @@ import React from 'react';
 
 import DropdownButton from 'react-bootstrap/lib/DropdownButton';
 
-import { getLangText } from '../../utils/lang_utils.js';
+import { getLangText } from '../../utils/lang.js';
 
 
 let PieceListToolbarFilterWidget = React.createClass({

js/components/ascribe_piece_list_toolbar/piece_list_toolbar_order_widget.js

@@ -4,7 +4,7 @@ import React from 'react';
 
 import DropdownButton from 'react-bootstrap/lib/DropdownButton';
 
-import { getLangText } from '../../utils/lang_utils.js';
+import { getLangText } from '../../utils/lang.js';
 
 let PieceListToolbarOrderWidget = React.createClass({
     propTypes: {

js/components/ascribe_settings/account_settings.js

@@ -19,7 +19,7 @@ import { currentUserShape, whitelabelShape } from '../prop_types';
 
 import ApiUrls from '../../constants/api_urls';
 
-import { getLangText } from '../../utils/lang_utils';
+import { getLangText } from '../../utils/lang';
 
 let AccountSettings = React.createClass({
     propTypes: {

js/components/ascribe_settings/api_settings.js

@@ -17,7 +17,7 @@ import CollapsibleParagraph from '../ascribe_collapsible/collapsible_paragraph';
 import ApiUrls from '../../constants/api_urls';
 import AscribeSpinner from '../ascribe_spinner';
 
-import { getLangText } from '../../utils/lang_utils';
+import { getLangText } from '../../utils/lang';
 
 
 let APISettings = React.createClass({

js/components/ascribe_settings/bitcoin_wallet_settings.js

@@ -12,7 +12,7 @@ import CollapsibleParagraph from '../ascribe_collapsible/collapsible_paragraph';
 
 import AscribeSpinner from '../ascribe_spinner';
 
-import { getLangText } from '../../utils/lang_utils';
+import { getLangText } from '../../utils/lang';
 
 
 let BitcoinWalletSettings = React.createClass({

js/components/ascribe_settings/contract_settings.js

@@ -19,9 +19,9 @@ import AclProxy from '../acl_proxy';
 import withContext from '../context/with_context';
 import { currentUserShape, whitelabelShape } from '../prop_types';
 
-import { setDocumentTitle } from '../../utils/dom_utils';
+import { setDocumentTitle } from '../../utils/dom';
-import { truncateTextAtCharIndex } from '../../utils/general_utils';
+import { truncateTextAtCharIndex } from '../../utils/general';
-import { getLangText } from '../../utils/lang_utils';
+import { getLangText } from '../../utils/lang';
 
 
 let ContractSettings = React.createClass({

js/components/ascribe_settings/contract_settings_update_button.js

@@ -15,8 +15,8 @@ import AppConstants from '../../constants/application_constants';
 import { validationTypes } from '../../constants/uploader_constants';
 
 import { formSubmissionValidation } from '../ascribe_uploader/react_s3_fine_uploader_utils';
-import { getCookie } from '../../utils/fetch_api_utils';
+import { getCookie } from '../../utils/fetch_api';
-import { getLangText } from '../../utils/lang_utils';
+import { getLangText } from '../../utils/lang';
 
 
 let ContractSettingsUpdateButton = React.createClass({

js/components/ascribe_settings/settings_container.js

@@ -13,8 +13,8 @@ import AclProxy from '../acl_proxy';
 import withContext from '../context/with_context';
 import { whitelabelShape } from '../prop_types';
 
-import { setDocumentTitle } from '../../utils/dom_utils';
+import { setDocumentTitle } from '../../utils/dom';
-import { getLangText } from '../../utils/lang_utils';
+import { getLangText } from '../../utils/lang';
 
 
 let SettingsContainer = React.createClass({

js/components/ascribe_settings/webhook_settings.js

@@ -19,7 +19,7 @@ import CollapsibleParagraph from '../ascribe_collapsible/collapsible_paragraph';
 import ApiUrls from '../../constants/api_urls';
 import AscribeSpinner from '../ascribe_spinner';
 
-import { getLangText } from '../../utils/lang_utils';
+import { getLangText } from '../../utils/lang';
 
 
 let WebhookSettings = React.createClass({

js/components/ascribe_social_share/facebook_share_button.js

@@ -6,7 +6,7 @@ import FacebookHandler from '../../third_party/facebook_handler';
 
 import AppConstants from '../../constants/application_constants';
 
-import { InjectInHeadUtils } from '../../utils/inject_utils';
+import { InjectInHeadUtils } from '../../utils/inject';
 
 let FacebookShareButton = React.createClass({
     propTypes: {

js/components/ascribe_social_share/twitter_share_button.js

@@ -4,7 +4,7 @@ import React from 'react';
 
 import AppConstants from '../../constants/application_constants';
 
-import { InjectInHeadUtils } from '../../utils/inject_utils';
+import { InjectInHeadUtils } from '../../utils/inject';
 
 let TwitterShareButton = React.createClass({
     propTypes: {

js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop.js

@@ -9,7 +9,7 @@ import FileDragAndDropErrorDialog from './file_drag_and_drop_error_dialog';
 import FileDragAndDropPreviewIterator from './file_drag_and_drop_preview_iterator';
 
 import { FileStatus } from '../react_s3_fine_uploader_utils';
-import { getLangText } from '../../../utils/lang_utils';
+import { getLangText } from '../../../utils/lang';
 
 
 // Taken from: https://github.com/fedosejev/react-file-drag-and-drop

js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_dialog.js

@@ -3,9 +3,9 @@
 import React from 'react';
 import { Link } from 'react-router';
 
-import { dragAndDropAvailable } from '../../../utils/feature_detection_utils';
+import { dragAndDropAvailable } from '../../../utils/feature_detection';
-import { getLangText } from '../../../utils/lang_utils';
+import { getLangText } from '../../../utils/lang';
-import { getCurrentQueryParams } from '../../../utils/url_utils';
+import { getCurrentQueryParams } from '../../../utils/url';
 
 let FileDragAndDropDialog = React.createClass({
     propTypes: {

js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_error_dialog.js

@@ -5,7 +5,7 @@ import classNames from 'classnames';
 
 import { ErrorClasses } from '../../../constants/error_constants';
 
-import { getLangText } from '../../../utils/lang_utils';
+import { getLangText } from '../../../utils/lang';
 
 let FileDragAndDropErrorDialog = React.createClass({
     propTypes: {

js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_preview.js

@@ -6,9 +6,9 @@ import FileDragAndDropPreviewImage from './file_drag_and_drop_preview_image';
 import FileDragAndDropPreviewOther from './file_drag_and_drop_preview_other';
 
 import { FileStatus } from '../react_s3_fine_uploader_utils';
-import { getLangText } from '../../../utils/lang_utils';
+import { getLangText } from '../../../utils/lang';
-import { truncateTextAtCharIndex } from '../../../utils/general_utils';
+import { truncateTextAtCharIndex } from '../../../utils/general';
-import { extractFileExtensionFromString } from '../../../utils/file_utils';
+import { extractFileExtensionFromString } from '../../../utils/file';
 
 
 const { shape, string, number, func, bool } = React.PropTypes;

js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_preview_image.js

@@ -5,7 +5,7 @@ import ProgressBar from 'react-bootstrap/lib/ProgressBar';
 
 import AclProxy from '../../acl_proxy';
 import AscribeSpinner from '../../ascribe_spinner';
-import { getLangText } from '../../../utils/lang_utils';
+import { getLangText } from '../../../utils/lang';
 
 
 const { number, string, func, bool } = React.PropTypes;

js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_preview_other.js

@@ -3,9 +3,8 @@
 import React from 'react';
 import ProgressBar from 'react-bootstrap/lib/ProgressBar';
 
-import AclProxy from '../../acl_proxy';
 import AscribeSpinner from '../../ascribe_spinner';
-import { getLangText } from '../../../utils/lang_utils';
+import { getLangText } from '../../../utils/lang';
 
 
 const { string, number, bool, func } = React.PropTypes;

js/components/ascribe_uploader/ascribe_upload_button/upload_button.js

@@ -4,8 +4,8 @@ import React from 'react';
 import classNames from 'classnames';
 
 import { displayValidProgressFilesFilter, FileStatus } from '../react_s3_fine_uploader_utils';
-import { getLangText } from '../../../utils/lang_utils';
+import { truncateTextAtCharIndex } from '../../../utils/general';
-import { truncateTextAtCharIndex } from '../../../utils/general_utils';
+import { getLangText } from '../../../utils/lang';
 
 const { func, array, bool, shape, string } = React.PropTypes;
 

js/components/ascribe_uploader/react_s3_fine_uploader.js

@@ -20,9 +20,9 @@ import { ErrorClasses, testErrorAgainstAll } from '../../constants/error_constan
 import { RETRY_ATTEMPT_TO_SHOW_CONTACT_US, ENDPOINTS } from '../../constants/uploader_constants';
 
 import { displayValidFilesFilter, FileStatus, transformAllowedExtensionsToInputAcceptProp } from './react_s3_fine_uploader_utils';
-import { getCookie } from '../../utils/fetch_api_utils';
+import { getCookie } from '../../utils/fetch_api';
-import { computeHashOfFile, extractFileExtensionFromString } from '../../utils/file_utils';
+import { computeHashOfFile, extractFileExtensionFromString } from '../../utils/file';
-import { getLangText } from '../../utils/lang_utils';
+import { getLangText } from '../../utils/lang';
 
 
 const { shape,

js/components/coa_verify_container.js

@@ -15,8 +15,8 @@ import { locationShape } from './prop_types';
 
 import ApiUrls from '../constants/api_urls';
 
-import { getLangText } from '../utils/lang_utils';
+import { setDocumentTitle } from '../utils/dom';
-import { setDocumentTitle } from '../utils/dom_utils';
+import { getLangText } from '../utils/lang';
 
 
 let CoaVerifyContainer = React.createClass({

js/components/context/with_context.js

@@ -1,8 +1,8 @@
 import React from 'react';
 import { currentUserShape, locationShape, routerShape, whitelabelShape } from '../prop_types';
 
-import { selectFromObject } from '../../utils/general_utils';
+import { selectFromObject } from '../../utils/general';
-import { getDisplayName } from '../../utils/react_utils';
+import { getDisplayName } from '../../utils/react';
 
 /**
  * ContextPropDefinitions

js/components/error_not_found_page.js

@@ -2,7 +2,7 @@ import React from 'react';
 
 import history from '../history';
 
-import { getLangText } from '../utils/lang_utils';
+import { getLangText } from '../utils/lang';
 
 
 const ErrorNotFoundPage = React.createClass({

js/components/footer.js

@@ -2,7 +2,7 @@
 
 import React from 'react';
 
-import { getLangText } from '../utils/lang_utils';
+import { getLangText } from '../utils/lang';
 
 
 const Footer = React.createClass({

js/components/global_notification.js

@@ -3,13 +3,12 @@
 import React from 'react';
 import classNames from 'classnames';
 
-import GlobalNotificationActions from '../actions/global_notification_actions';
-import GlobalNotificationStore from '../stores/global_notification_store';
-
 import Row from 'react-bootstrap/lib/Row';
 import Col from 'react-bootstrap/lib/Col';
 
-import { mergeOptions } from '../utils/general_utils';
+import GlobalNotificationStore from '../stores/global_notification_store';
+
+import { mergeOptions } from '../utils/general';
 
 const MAX_NOTIFICATION_BUBBLE_CONTAINER_WIDTH = 768;
 
@@ -60,7 +59,7 @@ let GlobalNotification = React.createClass({
 
         const notificationClasses = [];
 
-        if (this.state.containerWidth > 768) {
+        if (this.state.containerWidth > MAX_NOTIFICATION_BUBBLE_CONTAINER_WIDTH) {
             notificationClasses.push('ascribe-global-notification-bubble');
             notificationClasses.push(notificationStatus === 'show' ? 'ascribe-global-notification-bubble-on'
                                                                    : 'ascribe-global-notification-bubble-off');

js/components/header.js

@@ -20,8 +20,8 @@ import HeaderNotificationDebug from './header_notification_debug';
 import NavRoutesLinks from './nav_routes_links';
 import { currentUserShape, whitelabelShape } from './prop_types';
 
-import { constructHead } from '../utils/dom_utils';
+import { constructHead } from '../utils/dom';
-import { getLangText } from '../utils/lang_utils';
+import { getLangText } from '../utils/lang';
 
 
 let Header = React.createClass({

js/components/header_notifications.js

@@ -13,7 +13,7 @@ import NotificationStore from '../stores/notification_store';
 import withContext from './context/with_context';
 import { currentUserShape } from './prop_types';
 
-import { getLangText } from '../utils/lang_utils';
+import { getLangText } from '../utils/lang';
 
 
 let HeaderNotifications = React.createClass({

js/components/login_container.js

@@ -8,8 +8,8 @@ import LoginForm from './ascribe_forms/form_login';
 import withContext from './context/with_context';
 import { whitelabelShape } from './prop_types';
 
-import { setDocumentTitle } from '../utils/dom_utils';
+import { setDocumentTitle } from '../utils/dom';
-import { getLangText } from '../utils/lang_utils';
+import { getLangText } from '../utils/lang';
 
 
 let LoginContainer = React.createClass({

js/components/logout_container.js

@@ -2,12 +2,12 @@
 
 import React from 'react';
 
-import AscribeSpinner from './ascribe_spinner';
-
 import UserActions from '../actions/user_actions';
 
-import { getLangText } from '../utils/lang_utils';
+import AscribeSpinner from './ascribe_spinner';
-import { setDocumentTitle } from '../utils/dom_utils';
+
+import { setDocumentTitle } from '../utils/dom';
+import { getLangText } from '../utils/lang';
 
 
 let LogoutContainer = React.createClass({

js/components/nav_routes_links.js

@@ -4,11 +4,10 @@ import React from 'react';
 
 import Nav from 'react-bootstrap/lib/Nav';
 
+import AclProxy from './acl_proxy';
 import NavRoutesLinksLink from './nav_routes_links_link';
 
-import AclProxy from './acl_proxy';
+import { sanitizeList } from '../utils/general';
-
-import { sanitizeList } from '../utils/general_utils';
 
 
 const DISABLE_ENUM = ['hasPieces', 'noPieces'];

js/components/password_reset_container.js

@@ -14,8 +14,8 @@ import { locationShape, routerShape } from './prop_types';
 
 import ApiUrls from '../constants/api_urls';
 
-import { setDocumentTitle } from '../utils/dom_utils';
+import { setDocumentTitle } from '../utils/dom';
-import { getLangText } from '../utils/lang_utils';
+import { getLangText } from '../utils/lang';
 
 
 let PasswordResetContainer = React.createClass({

js/components/piece_list.js

@@ -24,10 +24,10 @@ import AscribeSpinner from './ascribe_spinner';
 import withContext from './context/with_context';
 import { locationShape, routerShape } from './prop_types';
 
-import { getAvailableAcls } from '../utils/acl_utils';
+import { getAvailableAcls } from '../utils/acl';
-import { setDocumentTitle } from '../utils/dom_utils';
+import { setDocumentTitle } from '../utils/dom';
-import { mergeOptions, isShallowEqual } from '../utils/general_utils';
+import { mergeOptions, isShallowEqual } from '../utils/general';
-import { getLangText } from '../utils/lang_utils';
+import { getLangText } from '../utils/lang';
 
 
 const PieceList = React.createClass({

js/components/register_piece.js

@@ -15,8 +15,8 @@ import RegisterPieceForm from './ascribe_forms/form_register_piece';
 import withContext from './context/with_context';
 import { routerShape, whitelabelShape } from './prop_types';
 
-import { setDocumentTitle } from '../utils/dom_utils';
+import { setDocumentTitle } from '../utils/dom';
-import { getLangText } from '../utils/lang_utils';
+import { getLangText } from '../utils/lang';
 
 
 const RegisterPiece = React.createClass( {

js/components/search_bar.js

@@ -4,11 +4,10 @@ import React from 'react';
 
 // FIXME: Input is deprecated
 import Input from 'react-bootstrap/lib/Input';
-import Glyphicon from 'react-bootstrap/lib/Glyphicon';
 
 import AscribeSpinner from './ascribe_spinner';
 
-import { getLangText } from '../utils/lang_utils';
+import { getLangText } from '../utils/lang';
 
 
 const { func, string, number } = React.PropTypes;

js/components/signup_container.js

@@ -6,8 +6,8 @@ import SignupForm from './ascribe_forms/form_signup';
 import withContext from './context/with_context';
 import { whitelabelShape } from './prop_types';
 
-import { setDocumentTitle } from '../utils/dom_utils';
+import { setDocumentTitle } from '../utils/dom';
-import { getLangText } from '../utils/lang_utils';
+import { getLangText } from '../utils/lang';
 
 
 let SignupContainer = React.createClass({

js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js

@@ -8,8 +8,8 @@ import LinkContainer from 'react-router-bootstrap/lib/LinkContainer';
 import withContext from '../../../../context/with_context';
 import { whitelabelShape } from '../../../../prop_types';
 
-import { setDocumentTitle } from '../../../../../utils/dom_utils';
+import { setDocumentTitle } from '../../../../../utils/dom';
-import { getLangText } from '../../../../../utils/lang_utils';
+import { getLangText } from '../../../../../utils/lang';
 
 
 let Vivi23Landing = React.createClass({

js/components/whitelabel/wallet/components/artcity/artcity_landing.js

@@ -8,8 +8,8 @@ import LinkContainer from 'react-router-bootstrap/lib/LinkContainer';
 import withContext from '../../../../context/with_context';
 import { whitelabelShape } from '../../../../prop_types';
 
-import { getLangText } from '../../../../../utils/lang_utils';
+import { getLangText } from '../../../../../utils/lang';
-import { setDocumentTitle } from '../../../../../utils/dom_utils';
+import { setDocumentTitle } from '../../../../../utils/dom';
 
 
 let ArtcityLanding = React.createClass({

js/components/whitelabel/wallet/components/ascribe_detail/wallet_action_panel.js

@@ -10,7 +10,7 @@ import AclProxy from '../../../../acl_proxy';
 import withContext from '../../../../context/with_context';
 import { currentUserShape } from '../../../../prop_types';
 
-import { mergeOptions } from '../../../../../utils/general_utils';
+import { mergeOptions } from '../../../../../utils/general';
 
 
 let WalletActionPanel = React.createClass({

js/components/whitelabel/wallet/components/ascribe_detail/wallet_piece_container.js

@@ -17,7 +17,7 @@ import withContext from '../../../../context/with_context';
 
 import ApiUrls from '../../../../../constants/api_urls';
 
-import { getLangText } from '../../../../../utils/lang_utils';
+import { getLangText } from '../../../../../utils/lang';
 
 
 let WalletPieceContainer = React.createClass({

js/components/whitelabel/wallet/components/cc/cc_register_piece.js

@@ -7,9 +7,9 @@ import Property from '../../../../ascribe_forms/property';
 import LicenseActions from '../../../../../actions/license_actions';
 import LicenseStore from '../../../../../stores/license_store';
 
-import { getLangText } from '../../../../../utils/lang_utils';
+import { setDocumentTitle } from '../../../../../utils/dom';
-import { setDocumentTitle } from '../../../../../utils/dom_utils';
+import { mergeOptions } from '../../../../../utils/general';
-import { mergeOptions } from '../../../../../utils/general_utils';
+import { getLangText } from '../../../../../utils/lang';
 
 let CCRegisterPiece = React.createClass({
     getInitialState() {

js/components/whitelabel/wallet/components/cyland/cyland_accordion_list/cyland_accordion_list_item.js

@@ -15,7 +15,7 @@ import AccordionListItemPiece from '../../../../../ascribe_accordion_list/accord
 
 import AclProxy from '../../../../../acl_proxy';
 
-import { getLangText } from '../../../../../../utils/lang_utils';
+import { getLangText } from '../../../../../../utils/lang';
 
 
 let CylandAccordionListItem = React.createClass({

js/components/whitelabel/wallet/components/cyland/cyland_buttons/cyland_submit_button.js

@@ -7,7 +7,7 @@ import Button from 'react-bootstrap/lib/Button';
 
 import LinkContainer from 'react-router-bootstrap/lib/LinkContainer';
 
-import { getLangText } from '../../../../../../utils/lang_utils';
+import { getLangText } from '../../../../../../utils/lang';
 
 
 let CylandSubmitButton = React.createClass({

js/components/whitelabel/wallet/components/cyland/cyland_detail/cyland_piece_container.js

@@ -23,9 +23,9 @@ import AscribeSpinner from '../../../../../ascribe_spinner';
 import withContext from '../../../../../context/with_context';
 import { routerShape } from '../../../../../prop_types';
 
-import { setDocumentTitle } from '../../../../../../utils/dom_utils';
+import { setDocumentTitle } from '../../../../../../utils/dom';
-import { mergeOptions } from '../../../../../../utils/general_utils';
+import { mergeOptions } from '../../../../../../utils/general';
-import { getLangText } from '../../../../../../utils/lang_utils';
+import { getLangText } from '../../../../../../utils/lang';
 
 
 const CylandPieceContainer = React.createClass({

js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js

@@ -17,7 +17,7 @@ import AscribeSpinner from '../../../../../ascribe_spinner';
 
 import requests from '../../../../../../utils/requests';
 
-import { getLangText } from '../../../../../../utils/lang_utils';
+import { getLangText } from '../../../../../../utils/lang';
 import { formSubmissionValidation } from '../../../../../ascribe_uploader/react_s3_fine_uploader_utils';