diff --git a/docs/coding/structures.rst b/docs/coding/structures.rst
index b1e94aa1296f021d96568ec3c31326f0ec1f0415..09aa2d00b3a87c533481783db455b490f04b1243 100644
--- a/docs/coding/structures.rst
+++ b/docs/coding/structures.rst
@@ -110,7 +110,7 @@ HashableMixin
 ComparableAndHashableByInt
 --------------------------
 
-.. autoclass:: satella.coding.ComparableAndHashableByInt
+.. autoclass:: satella.coding.structures.ComparableAndHashableByInt
     :members:
 
 OmniHashableMixin
diff --git a/satella/configuration/schema/__init__.py b/satella/configuration/schema/__init__.py
index 3e87cdbc2356aef4e2ba352275112754875c8215..2d9b4e50b67e6151106ff8e931a2bf9dea1d162e 100644
--- a/satella/configuration/schema/__init__.py
+++ b/satella/configuration/schema/__init__.py
@@ -1,6 +1,6 @@
 from .base import CheckerCondition, Descriptor
 from .basic import IPv4, Integer, String, Float, Boolean, File, Directory, FileObject, \
-    DirectoryObject
+    DirectoryObject, Regexp, FileContents
 from .from_json import descriptor_from_dict
 from .registry import register_custom_descriptor
 from .structs import Union, List, Dict, Caster, create_key
@@ -8,4 +8,4 @@ from .structs import Union, List, Dict, Caster, create_key
 __all__ = ['CheckerCondition', 'Descriptor', 'descriptor_from_dict', 'IPv4', 'Integer',
            'String', 'Float', 'Boolean', 'Union', 'List', 'Dict', 'Caster',
            'File', 'FileObject', 'DirectoryObject', 'Directory',
-           'register_custom_descriptor', 'create_key']
+           'register_custom_descriptor', 'create_key', 'Regexp', 'FileContents']
diff --git a/satella/files.py b/satella/files.py
index 7a4430f1fb6ea9d75a5900e402a800e9b0554ca1..a782a26485551ef0bb1ac4a0fae45b21af387922 100644
--- a/satella/files.py
+++ b/satella/files.py
@@ -4,8 +4,6 @@ import io
 import os
 import re
 import shutil
-import types
-import typing
 import typing as tp
 
 __all__ = ['read_re_sub_and_write', 'find_files', 'split', 'read_in_file', 'write_to_file',