diff --git a/src/short-urls/CreateShortUrl.js b/src/short-urls/CreateShortUrl.js
index 3db73243..5d1bfde6 100644
--- a/src/short-urls/CreateShortUrl.js
+++ b/src/short-urls/CreateShortUrl.js
@@ -6,7 +6,7 @@ import React from 'react';
 import { connect } from 'react-redux';
 import { Collapse } from 'reactstrap';
 import DateInput from '../common/DateInput';
-import TagsSelector from '../utils/TagsSelector';
+import TagsSelector from '../tags/helpers/TagsSelector';
 import CreateShortUrlResult from './helpers/CreateShortUrlResult';
 import { createShortUrl, resetCreateShortUrl } from './reducers/shortUrlCreationResult';
 
diff --git a/src/short-urls/SearchBar.js b/src/short-urls/SearchBar.js
index c17dba62..6cd5cf3d 100644
--- a/src/short-urls/SearchBar.js
+++ b/src/short-urls/SearchBar.js
@@ -4,7 +4,7 @@ import React from 'react';
 import { connect } from 'react-redux';
 import { isEmpty, pick } from 'ramda';
 import PropTypes from 'prop-types';
-import Tag from '../utils/Tag';
+import Tag from '../tags/helpers/Tag';
 import SearchField from '../utils/SearchField';
 import { listShortUrls } from './reducers/shortUrlsList';
 import './SearchBar.scss';
diff --git a/src/short-urls/helpers/EditTagsModal.js b/src/short-urls/helpers/EditTagsModal.js
index 38a95949..c3832bb5 100644
--- a/src/short-urls/helpers/EditTagsModal.js
+++ b/src/short-urls/helpers/EditTagsModal.js
@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
 import { Modal, ModalBody, ModalFooter, ModalHeader } from 'reactstrap';
 import PropTypes from 'prop-types';
 import { pick } from 'ramda';
-import TagsSelector from '../../utils/TagsSelector';
+import TagsSelector from '../../tags/helpers/TagsSelector';
 import {
   editShortUrlTags,
   resetShortUrlsTags,
diff --git a/src/short-urls/helpers/ShortUrlsRow.js b/src/short-urls/helpers/ShortUrlsRow.js
index 0fbd9e82..f9d64420 100644
--- a/src/short-urls/helpers/ShortUrlsRow.js
+++ b/src/short-urls/helpers/ShortUrlsRow.js
@@ -2,7 +2,7 @@ import { isEmpty } from 'ramda';
 import React from 'react';
 import Moment from 'react-moment';
 import PropTypes from 'prop-types';
-import Tag from '../../utils/Tag';
+import Tag from '../../tags/helpers/Tag';
 import { shortUrlsListParamsType } from '../reducers/shortUrlsListParams';
 import { serverType } from '../../servers/prop-types';
 import ExternalLink from '../../utils/ExternalLink';
diff --git a/src/tags/TagCard.js b/src/tags/TagCard.js
index 3222a37d..8121e570 100644
--- a/src/tags/TagCard.js
+++ b/src/tags/TagCard.js
@@ -5,7 +5,7 @@ import editIcon from '@fortawesome/fontawesome-free-solid/faPencilAlt';
 import PropTypes from 'prop-types';
 import React from 'react';
 import { Link } from 'react-router-dom';
-import TagBullet from '../utils/TagBullet';
+import TagBullet from './helpers/TagBullet';
 import './TagCard.scss';
 import DeleteTagConfirmModal from './helpers/DeleteTagConfirmModal';
 import EditTagModal from './helpers/EditTagModal';
diff --git a/src/utils/Tag.js b/src/tags/helpers/Tag.js
similarity index 91%
rename from src/utils/Tag.js
rename to src/tags/helpers/Tag.js
index f22787ce..a08085a9 100644
--- a/src/utils/Tag.js
+++ b/src/tags/helpers/Tag.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import colorGenerator, { colorGeneratorType } from '../utils/ColorGenerator';
+import colorGenerator, { colorGeneratorType } from '../../utils/ColorGenerator';
 import './Tag.scss';
 
 const propTypes = {
diff --git a/src/utils/Tag.scss b/src/tags/helpers/Tag.scss
similarity index 100%
rename from src/utils/Tag.scss
rename to src/tags/helpers/Tag.scss
diff --git a/src/utils/TagBullet.js b/src/tags/helpers/TagBullet.js
similarity index 86%
rename from src/utils/TagBullet.js
rename to src/tags/helpers/TagBullet.js
index ccdc4801..1427613a 100644
--- a/src/utils/TagBullet.js
+++ b/src/tags/helpers/TagBullet.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import * as PropTypes from 'prop-types';
-import colorGenerator, { colorGeneratorType } from './ColorGenerator';
+import colorGenerator, { colorGeneratorType } from '../../utils/ColorGenerator';
 import './TagBullet.scss';
 
 const propTypes = {
diff --git a/src/utils/TagBullet.scss b/src/tags/helpers/TagBullet.scss
similarity index 100%
rename from src/utils/TagBullet.scss
rename to src/tags/helpers/TagBullet.scss
diff --git a/src/utils/TagsSelector.js b/src/tags/helpers/TagsSelector.js
similarity index 95%
rename from src/utils/TagsSelector.js
rename to src/tags/helpers/TagsSelector.js
index 141947f9..4a218448 100644
--- a/src/utils/TagsSelector.js
+++ b/src/tags/helpers/TagsSelector.js
@@ -4,8 +4,8 @@ import TagsInput from 'react-tagsinput';
 import PropTypes from 'prop-types';
 import Autosuggest from 'react-autosuggest';
 import { pick, identity } from 'ramda';
-import { listTags } from '../tags/reducers/tagsList';
-import colorGenerator, { colorGeneratorType } from './ColorGenerator';
+import { listTags } from '../reducers/tagsList';
+import colorGenerator, { colorGeneratorType } from '../../utils/ColorGenerator';
 import './TagsSelector.scss';
 import TagBullet from './TagBullet';
 
diff --git a/src/utils/TagsSelector.scss b/src/tags/helpers/TagsSelector.scss
similarity index 90%
rename from src/utils/TagsSelector.scss
rename to src/tags/helpers/TagsSelector.scss
index 24a68c8e..aba09e1b 100644
--- a/src/utils/TagsSelector.scss
+++ b/src/tags/helpers/TagsSelector.scss
@@ -1,4 +1,4 @@
-@import './base';
+@import '../../utils/base';
 
 .react-autosuggest__suggestions-list {
   list-style-type: none;