diff --git a/Lib/fontbakery/profiles/opentype.py b/Lib/fontbakery/profiles/opentype/__init__.py
similarity index 90%
rename from Lib/fontbakery/profiles/opentype.py
rename to Lib/fontbakery/profiles/opentype/__init__.py
index 292f066398..6578ef39d0 100644
--- a/Lib/fontbakery/profiles/opentype.py
+++ b/Lib/fontbakery/profiles/opentype/__init__.py
@@ -1,30 +1,30 @@
 from fontbakery.fonts_profile import profile_factory
 from fontbakery.section import Section
 
+from .cff import *
+from .cmap import *
+from .head import *
+from .os2 import *
+from .post import *
+from .name import *
+from .loca import *
+from .hhea import *
+from .dsig import *
+from .gdef import *
+from .gpos import *
+from .kern import *
+from .glyf import *
+from .fvar import *
+from .stat import *
+from .layout import *
+
 profile_imports = (
     (
-        ".",
-        (
-            "cff",
-            "cmap",
-            "head",
-            "os2",
-            "post",
-            "name",
-            "loca",
-            "hhea",
-            "dsig",
-            "gdef",
-            "gpos",
-            "kern",
-            "glyf",
-            "fvar",
-            "stat",
-            "layout",
-            "shared_conditions",
-        ),
+        "..",
+        ("shared_conditions",),
     ),
 )
+
 profile = profile_factory(default_section=Section("OpenType Specification Checks"))
 
 OPENTYPE_PROFILE_CHECKS = [
diff --git a/Lib/fontbakery/profiles/cff.py b/Lib/fontbakery/profiles/opentype/cff.py
similarity index 97%
rename from Lib/fontbakery/profiles/cff.py
rename to Lib/fontbakery/profiles/opentype/cff.py
index 289b62cba2..01ac5e349b 100644
--- a/Lib/fontbakery/profiles/cff.py
+++ b/Lib/fontbakery/profiles/opentype/cff.py
@@ -2,11 +2,6 @@
 from fontbakery.status import FAIL, PASS, WARN
 from fontbakery.message import Message
 
-# used to inform get_module_profile whether and how to create a profile
-from fontbakery.fonts_profile import profile_factory  # noqa:F401 pylint:disable=W0611
-
-profile_imports = ((".", ("shared_conditions",)),)
-
 
 class CFFAnalysis:
     def __init__(self):
diff --git a/Lib/fontbakery/profiles/cmap.py b/Lib/fontbakery/profiles/opentype/cmap.py
similarity index 85%
rename from Lib/fontbakery/profiles/cmap.py
rename to Lib/fontbakery/profiles/opentype/cmap.py
index a544e64018..d138938cad 100644
--- a/Lib/fontbakery/profiles/cmap.py
+++ b/Lib/fontbakery/profiles/opentype/cmap.py
@@ -2,9 +2,6 @@
 from fontbakery.status import FAIL, PASS
 from fontbakery.message import Message
 
-# used to inform get_module_profile whether and how to create a profile
-from fontbakery.fonts_profile import profile_factory  # noqa:F401 pylint:disable=W0611
-
 
 @check(
     id="com.google.fonts/check/family/equal_unicode_encodings",
diff --git a/Lib/fontbakery/profiles/dsig.py b/Lib/fontbakery/profiles/opentype/dsig.py
similarity index 90%
rename from Lib/fontbakery/profiles/dsig.py
rename to Lib/fontbakery/profiles/opentype/dsig.py
index 1bd72e048c..f2984ef62d 100644
--- a/Lib/fontbakery/profiles/dsig.py
+++ b/Lib/fontbakery/profiles/opentype/dsig.py
@@ -2,9 +2,6 @@
 from fontbakery.status import WARN, PASS
 from fontbakery.message import Message
 
-# used to inform get_module_profile whether and how to create a profile
-from fontbakery.fonts_profile import profile_factory  # noqa:F401 pylint:disable=W0611
-
 
 @check(
     id="com.google.fonts/check/dsig",
diff --git a/Lib/fontbakery/profiles/fvar.py b/Lib/fontbakery/profiles/opentype/fvar.py
similarity index 99%
rename from Lib/fontbakery/profiles/fvar.py
rename to Lib/fontbakery/profiles/opentype/fvar.py
index a2f8452124..cd8d57b237 100644
--- a/Lib/fontbakery/profiles/fvar.py
+++ b/Lib/fontbakery/profiles/opentype/fvar.py
@@ -3,11 +3,6 @@
 from fontbakery.status import FAIL, PASS, WARN
 from fontbakery.message import Message
 
-# used to inform get_module_profile whether and how to create a profile
-from fontbakery.fonts_profile import profile_factory  # noqa:F401 pylint:disable=W0611
-
-profile_imports = ((".", ("shared_conditions",)),)
-
 
 @check(
     id="com.google.fonts/check/varfont/regular_wght_coord",
diff --git a/Lib/fontbakery/profiles/gdef.py b/Lib/fontbakery/profiles/opentype/gdef.py
similarity index 97%
rename from Lib/fontbakery/profiles/gdef.py
rename to Lib/fontbakery/profiles/opentype/gdef.py
index 53d92e2f87..be9d3363da 100644
--- a/Lib/fontbakery/profiles/gdef.py
+++ b/Lib/fontbakery/profiles/opentype/gdef.py
@@ -2,9 +2,6 @@
 from fontbakery.status import PASS, WARN, SKIP
 from fontbakery.message import Message
 
-# used to inform get_module_profile whether and how to create a profile
-from fontbakery.fonts_profile import profile_factory  # noqa:F401 pylint:disable=W0611
-
 
 def _is_non_spacing_mark_char(charcode):
     from fontTools import unicodedata
diff --git a/Lib/fontbakery/profiles/glyf.py b/Lib/fontbakery/profiles/opentype/glyf.py
similarity index 96%
rename from Lib/fontbakery/profiles/glyf.py
rename to Lib/fontbakery/profiles/opentype/glyf.py
index 16b31b8f08..26e62e111a 100644
--- a/Lib/fontbakery/profiles/glyf.py
+++ b/Lib/fontbakery/profiles/opentype/glyf.py
@@ -4,9 +4,6 @@
 from fontbakery.callable import check
 from fontbakery.status import FAIL, PASS, WARN
 
-# used to inform get_module_profile whether and how to create a profile
-from fontbakery.fonts_profile import profile_factory  # noqa:F401 pylint:disable=W0611
-
 
 @check(
     id="com.google.fonts/check/glyf_unused_data",
diff --git a/Lib/fontbakery/profiles/gpos.py b/Lib/fontbakery/profiles/opentype/gpos.py
similarity index 89%
rename from Lib/fontbakery/profiles/gpos.py
rename to Lib/fontbakery/profiles/opentype/gpos.py
index 0e2f2d9897..739aeb7e70 100644
--- a/Lib/fontbakery/profiles/gpos.py
+++ b/Lib/fontbakery/profiles/opentype/gpos.py
@@ -2,9 +2,6 @@
 from fontbakery.status import PASS, WARN
 from fontbakery.message import Message
 
-# used to inform get_module_profile whether and how to create a profile
-from fontbakery.fonts_profile import profile_factory  # noqa:F401 pylint:disable=W0611
-
 
 @condition
 def has_kerning_info(ttFont):
diff --git a/Lib/fontbakery/profiles/head.py b/Lib/fontbakery/profiles/opentype/head.py
similarity index 97%
rename from Lib/fontbakery/profiles/head.py
rename to Lib/fontbakery/profiles/opentype/head.py
index 8e6f355280..23f5a3c162 100644
--- a/Lib/fontbakery/profiles/head.py
+++ b/Lib/fontbakery/profiles/opentype/head.py
@@ -5,9 +5,6 @@
 from fontbakery.message import Message
 from fontbakery.constants import NameID
 
-# used to inform get_module_profile whether and how to create a profile
-from fontbakery.fonts_profile import profile_factory  # noqa:F401 pylint:disable=W0611
-
 
 @check(
     id="com.google.fonts/check/family/equal_font_versions", proposal="legacy:check/014"
diff --git a/Lib/fontbakery/profiles/hhea.py b/Lib/fontbakery/profiles/opentype/hhea.py
similarity index 93%
rename from Lib/fontbakery/profiles/hhea.py
rename to Lib/fontbakery/profiles/opentype/hhea.py
index 1f82ef0f26..34b36ac99b 100644
--- a/Lib/fontbakery/profiles/hhea.py
+++ b/Lib/fontbakery/profiles/opentype/hhea.py
@@ -2,11 +2,6 @@
 from fontbakery.status import FAIL, PASS
 from fontbakery.message import Message
 
-# used to inform get_module_profile whether and how to create a profile
-from fontbakery.fonts_profile import profile_factory  # noqa:F401 pylint:disable=W0611
-
-profile_imports = [(".shared_conditions", ("glyph_metrics_stats", "is_ttf"))]
-
 
 @check(id="com.google.fonts/check/maxadvancewidth", proposal="legacy:check/073")
 def com_google_fonts_check_maxadvancewidth(ttFont):
diff --git a/Lib/fontbakery/profiles/kern.py b/Lib/fontbakery/profiles/opentype/kern.py
similarity index 95%
rename from Lib/fontbakery/profiles/kern.py
rename to Lib/fontbakery/profiles/opentype/kern.py
index e919c83bd7..b8f5f087c7 100644
--- a/Lib/fontbakery/profiles/kern.py
+++ b/Lib/fontbakery/profiles/opentype/kern.py
@@ -2,9 +2,6 @@
 from fontbakery.status import FAIL, INFO, PASS, WARN
 from fontbakery.message import Message
 
-# used to inform get_module_profile whether and how to create a profile
-from fontbakery.fonts_profile import profile_factory  # noqa:F401 pylint:disable=W0611
-
 
 @check(
     id="com.google.fonts/check/kern_table",
diff --git a/Lib/fontbakery/profiles/layout.py b/Lib/fontbakery/profiles/opentype/layout.py
similarity index 95%
rename from Lib/fontbakery/profiles/layout.py
rename to Lib/fontbakery/profiles/opentype/layout.py
index 44f91a00ac..bfadf83c72 100644
--- a/Lib/fontbakery/profiles/layout.py
+++ b/Lib/fontbakery/profiles/opentype/layout.py
@@ -4,11 +4,6 @@
 from fontbakery.status import PASS, FAIL
 from fontbakery.message import Message
 
-# used to inform get_module_profile whether and how to create a profile
-from fontbakery.fonts_profile import profile_factory  # noqa:F401 pylint:disable=W0611
-
-profile_imports = ((".", ("shared_conditions",)),)
-
 
 def feature_tags(ttFont):
     in_this_font = set()
diff --git a/Lib/fontbakery/profiles/loca.py b/Lib/fontbakery/profiles/opentype/loca.py
similarity index 75%
rename from Lib/fontbakery/profiles/loca.py
rename to Lib/fontbakery/profiles/opentype/loca.py
index 55a8949128..d8479c71e0 100644
--- a/Lib/fontbakery/profiles/loca.py
+++ b/Lib/fontbakery/profiles/opentype/loca.py
@@ -2,11 +2,6 @@
 from fontbakery.status import PASS, FAIL
 from fontbakery.message import Message
 
-# used to inform get_module_profile whether and how to create a profile
-from fontbakery.fonts_profile import profile_factory  # noqa:F401 pylint:disable=W0611
-
-profile_imports = ((".", ("shared_conditions",)),)
-
 
 @check(
     id="com.google.fonts/check/loca/maxp_num_glyphs",
diff --git a/Lib/fontbakery/profiles/name.py b/Lib/fontbakery/profiles/opentype/name.py
similarity index 99%
rename from Lib/fontbakery/profiles/name.py
rename to Lib/fontbakery/profiles/opentype/name.py
index af015ce7df..3b247854f0 100644
--- a/Lib/fontbakery/profiles/name.py
+++ b/Lib/fontbakery/profiles/opentype/name.py
@@ -8,11 +8,7 @@
     WindowsLanguageID,
 )
 from fontbakery.utils import markdown_table
-
-# used to inform get_module_profile whether and how to create a profile
-from fontbakery.fonts_profile import profile_factory  # noqa:F401 pylint:disable=W0611
-
-profile_imports = [(".shared_conditions", ("glyph_metrics_stats", "is_ttf", "is_cff"))]
+from fontbakery.profiles.shared_conditions import glyph_metrics_stats, is_ttf, is_cff
 
 
 @check(
diff --git a/Lib/fontbakery/profiles/os2.py b/Lib/fontbakery/profiles/opentype/os2.py
similarity index 98%
rename from Lib/fontbakery/profiles/os2.py
rename to Lib/fontbakery/profiles/opentype/os2.py
index 64622fa6b3..4893da7dcf 100644
--- a/Lib/fontbakery/profiles/os2.py
+++ b/Lib/fontbakery/profiles/opentype/os2.py
@@ -1,14 +1,8 @@
 from fontbakery.callable import check
 from fontbakery.status import FAIL, PASS, WARN, INFO, SKIP
 from fontbakery.message import Message
-
-# used to inform get_module_profile whether and how to create a profile
-from fontbakery.fonts_profile import profile_factory  # noqa:F401 pylint:disable=W0611
-
-profile_imports = [
-    (".shared_conditions", ("vmetrics",)),
-    (".googlefonts_conditions", ("RIBBI_ttFonts",)),
-]
+from fontbakery.profiles.shared_conditions import vmetrics
+from fontbakery.profiles.googlefonts_conditions import RIBBI_ttFonts
 
 
 @check(
diff --git a/Lib/fontbakery/profiles/post.py b/Lib/fontbakery/profiles/opentype/post.py
similarity index 98%
rename from Lib/fontbakery/profiles/post.py
rename to Lib/fontbakery/profiles/opentype/post.py
index 12c8d0622c..ec6717e094 100644
--- a/Lib/fontbakery/profiles/post.py
+++ b/Lib/fontbakery/profiles/opentype/post.py
@@ -2,11 +2,6 @@
 from fontbakery.status import FAIL, PASS, WARN
 from fontbakery.message import Message
 
-# used to inform get_module_profile whether and how to create a profile
-from fontbakery.fonts_profile import profile_factory  # noqa:F401 pylint:disable=W0611
-
-profile_imports = [(".shared_conditions", ("is_ttf",))]
-
 
 @check(
     id="com.google.fonts/check/family/underline_thickness",
diff --git a/Lib/fontbakery/profiles/stat.py b/Lib/fontbakery/profiles/opentype/stat.py
similarity index 98%
rename from Lib/fontbakery/profiles/stat.py
rename to Lib/fontbakery/profiles/opentype/stat.py
index 095d293276..f9df695690 100644
--- a/Lib/fontbakery/profiles/stat.py
+++ b/Lib/fontbakery/profiles/opentype/stat.py
@@ -5,11 +5,6 @@
 from fontbakery.status import FAIL, PASS, WARN, SKIP
 from fontbakery.utils import bullet_list
 
-# used to inform get_module_profile whether and how to create a profile
-from fontbakery.fonts_profile import profile_factory  # noqa:F401 pylint:disable=W0611
-
-profile_imports = ((".", ("shared_conditions",)),)
-
 
 @check(
     id="com.google.fonts/check/varfont/stat_axis_record_for_each_axis",
diff --git a/Lib/fontbakery/profiles/universal.py b/Lib/fontbakery/profiles/universal.py
index 9957117e43..dfb481ba75 100644
--- a/Lib/fontbakery/profiles/universal.py
+++ b/Lib/fontbakery/profiles/universal.py
@@ -9,8 +9,8 @@
 from fontbakery.fonts_profile import profile_factory
 from fontbakery.glyphdata import desired_glyph_data
 from fontbakery.message import Message
-from fontbakery.profiles.layout import feature_tags
 from fontbakery.profiles.opentype import OPENTYPE_PROFILE_CHECKS
+from fontbakery.profiles.opentype.layout import feature_tags
 from fontbakery.section import Section
 from fontbakery.status import PASS, FAIL, WARN, INFO, SKIP
 from fontbakery.utils import (
diff --git a/tests/profiles/cff_test.py b/tests/profiles/cff_test.py
index e4a2cca6a9..90fa147135 100644
--- a/tests/profiles/cff_test.py
+++ b/tests/profiles/cff_test.py
@@ -5,13 +5,13 @@
     TEST_FILE,
 )
 from fontbakery.status import DEBUG, INFO, WARN, ERROR, SKIP, PASS, FAIL
-from fontbakery.profiles import cff as cff_profile
+from fontbakery.profiles import opentype as opentype_profile
 
 check_statuses = (ERROR, FAIL, SKIP, PASS, WARN, INFO, DEBUG)
 
 
 def test_check_cff_call_depth():
-    check = CheckTester(cff_profile, "com.adobe.fonts/check/cff_call_depth")
+    check = CheckTester(opentype_profile, "com.adobe.fonts/check/cff_call_depth")
 
     # this font's CFF subr call depths should all be <= 10:
     font = TEST_FILE("source-sans-pro/OTF/SourceSansPro-Regular.otf")
@@ -44,7 +44,7 @@ def test_check_cff_call_depth():
 
 
 def test_check_cff2_call_depth():
-    check = CheckTester(cff_profile, "com.adobe.fonts/check/cff2_call_depth")
+    check = CheckTester(opentype_profile, "com.adobe.fonts/check/cff2_call_depth")
 
     # this font's CFF subr call depths should all be <= 10:
     font = TEST_FILE("source-sans-pro/VAR/SourceSansVariable-Roman.otf")
@@ -77,7 +77,9 @@ def test_check_cff2_call_depth():
 
 
 def test_check_cff_deprecated_operators():
-    check = CheckTester(cff_profile, "com.adobe.fonts/check/cff_deprecated_operators")
+    check = CheckTester(
+        opentype_profile, "com.adobe.fonts/check/cff_deprecated_operators"
+    )
 
     # this font uses the deprecated 'dotsection' operator
     font = TEST_FILE("deprecated_operators/cff1_dotsection.otf")
diff --git a/tests/profiles/external_profile_test.py b/tests/profiles/external_profile_test.py
index 14ea865b29..e4f74739b7 100644
--- a/tests/profiles/external_profile_test.py
+++ b/tests/profiles/external_profile_test.py
@@ -35,7 +35,9 @@ def test_external_profile():
     assert len(profile.sections) > 1
 
 
-def test_profile_imports():
+## FIXME: Some opentype profile examples here are not valid anymore. Should we update
+##        the examples, or should we simply deprecate the feature of sub-profiles?
+def DISABLE_test_profile_imports():
     """
     When a names array in profile_imports contained sub module names, the import
     would fail.
diff --git a/tests/profiles/head_test.py b/tests/profiles/head_test.py
index 5cdba879b4..531a9e4a68 100644
--- a/tests/profiles/head_test.py
+++ b/tests/profiles/head_test.py
@@ -99,7 +99,7 @@ def test_check_unitsperem():
 
 def test_parse_version_string():
     """Checking font version fields."""
-    from fontbakery.profiles.head import parse_version_string
+    from fontbakery.profiles.opentype.head import parse_version_string
     import fractions
 
     version_tests_good = {
diff --git a/tests/profiles/layout_test.py b/tests/profiles/layout_test.py
index 9528ef8e5a..fb31b914c6 100644
--- a/tests/profiles/layout_test.py
+++ b/tests/profiles/layout_test.py
@@ -5,13 +5,13 @@
     CheckTester,
     TEST_FILE,
 )
-from fontbakery.profiles import layout as layout_profile
+from fontbakery.profiles import opentype as opentype_profile
 
 
 def test_check_layout_valid_feature_tags():
     """Does the font have any invalid feature tags?"""
     check = CheckTester(
-        layout_profile, "com.google.fonts/check/layout_valid_feature_tags"
+        opentype_profile, "com.google.fonts/check/layout_valid_feature_tags"
     )
 
     font = TEST_FILE("nunito/Nunito-Regular.ttf")
@@ -24,7 +24,7 @@ def test_check_layout_valid_feature_tags():
 def test_check_layout_valid_script_tags():
     """Does the font have any invalid script tags?"""
     check = CheckTester(
-        layout_profile, "com.google.fonts/check/layout_valid_script_tags"
+        opentype_profile, "com.google.fonts/check/layout_valid_script_tags"
     )
 
     font = TEST_FILE("nunito/Nunito-Regular.ttf")
@@ -37,7 +37,7 @@ def test_check_layout_valid_script_tags():
 def test_check_layout_valid_language_tags():
     """Does the font have any invalid language tags?"""
     check = CheckTester(
-        layout_profile, "com.google.fonts/check/layout_valid_language_tags"
+        opentype_profile, "com.google.fonts/check/layout_valid_language_tags"
     )
 
     font = TEST_FILE("nunito/Nunito-Regular.ttf")