diff --git a/doc/sphinx/Makefile b/docs/sphinx/Makefile
similarity index 100%
rename from doc/sphinx/Makefile
rename to docs/sphinx/Makefile
diff --git a/doc/sphinx/requirements.txt b/docs/sphinx/requirements.txt
similarity index 100%
rename from doc/sphinx/requirements.txt
rename to docs/sphinx/requirements.txt
diff --git a/doc/sphinx/source/conf.py b/docs/sphinx/source/conf.py
similarity index 100%
rename from doc/sphinx/source/conf.py
rename to docs/sphinx/source/conf.py
diff --git a/doc/sphinx/source/index.rst b/docs/sphinx/source/index.rst
similarity index 100%
rename from doc/sphinx/source/index.rst
rename to docs/sphinx/source/index.rst
diff --git a/doc/sphinx/source/installation.rst b/docs/sphinx/source/installation.rst
similarity index 100%
rename from doc/sphinx/source/installation.rst
rename to docs/sphinx/source/installation.rst
diff --git a/doc/sphinx/source/manual.rst b/docs/sphinx/source/manual.rst
similarity index 100%
rename from doc/sphinx/source/manual.rst
rename to docs/sphinx/source/manual.rst
diff --git a/doc/sphinx/source/releases.rst b/docs/sphinx/source/releases.rst
similarity index 100%
rename from doc/sphinx/source/releases.rst
rename to docs/sphinx/source/releases.rst
diff --git a/doc/sphinx/source/releases/next.rst b/docs/sphinx/source/releases/next.rst
similarity index 100%
rename from doc/sphinx/source/releases/next.rst
rename to docs/sphinx/source/releases/next.rst
diff --git a/doc/sphinx/source/releases/v1.6.0.rst b/docs/sphinx/source/releases/v1.6.0.rst
similarity index 100%
rename from doc/sphinx/source/releases/v1.6.0.rst
rename to docs/sphinx/source/releases/v1.6.0.rst
diff --git a/doc/sphinx/source/releases/v2016.1.0.rst b/docs/sphinx/source/releases/v2016.1.0.rst
similarity index 100%
rename from doc/sphinx/source/releases/v2016.1.0.rst
rename to docs/sphinx/source/releases/v2016.1.0.rst
diff --git a/doc/sphinx/source/releases/v2016.2.0.rst b/docs/sphinx/source/releases/v2016.2.0.rst
similarity index 100%
rename from doc/sphinx/source/releases/v2016.2.0.rst
rename to docs/sphinx/source/releases/v2016.2.0.rst
diff --git a/doc/sphinx/source/releases/v2017.1.0.post1.rst b/docs/sphinx/source/releases/v2017.1.0.post1.rst
similarity index 100%
rename from doc/sphinx/source/releases/v2017.1.0.post1.rst
rename to docs/sphinx/source/releases/v2017.1.0.post1.rst
diff --git a/doc/sphinx/source/releases/v2017.1.0.rst b/docs/sphinx/source/releases/v2017.1.0.rst
similarity index 100%
rename from doc/sphinx/source/releases/v2017.1.0.rst
rename to docs/sphinx/source/releases/v2017.1.0.rst
diff --git a/doc/sphinx/source/releases/v2017.2.0.rst b/docs/sphinx/source/releases/v2017.2.0.rst
similarity index 100%
rename from doc/sphinx/source/releases/v2017.2.0.rst
rename to docs/sphinx/source/releases/v2017.2.0.rst
diff --git a/doc/sphinx/source/releases/v2018.1.0.rst b/docs/sphinx/source/releases/v2018.1.0.rst
similarity index 100%
rename from doc/sphinx/source/releases/v2018.1.0.rst
rename to docs/sphinx/source/releases/v2018.1.0.rst
diff --git a/doc/sphinx/source/releases/v2019.1.0.rst b/docs/sphinx/source/releases/v2019.1.0.rst
similarity index 100%
rename from doc/sphinx/source/releases/v2019.1.0.rst
rename to docs/sphinx/source/releases/v2019.1.0.rst
diff --git a/test/fiat_mapping.py b/test/finat/fiat_mapping.py
similarity index 100%
rename from test/fiat_mapping.py
rename to test/finat/fiat_mapping.py
diff --git a/test/test_direct_serendipity.py b/test/finat/test_direct_serendipity.py
similarity index 100%
rename from test/test_direct_serendipity.py
rename to test/finat/test_direct_serendipity.py
diff --git a/test/test_hash.py b/test/finat/test_hash.py
similarity index 100%
rename from test/test_hash.py
rename to test/finat/test_hash.py
diff --git a/test/test_mass_conditioning.py b/test/finat/test_mass_conditioning.py
similarity index 100%
rename from test/test_mass_conditioning.py
rename to test/finat/test_mass_conditioning.py
diff --git a/test/test_point_evaluation_ciarlet.py b/test/finat/test_point_evaluation_ciarlet.py
similarity index 100%
rename from test/test_point_evaluation_ciarlet.py
rename to test/finat/test_point_evaluation_ciarlet.py
diff --git a/test/test_restriction.py b/test/finat/test_restriction.py
similarity index 100%
rename from test/test_restriction.py
rename to test/finat/test_restriction.py
diff --git a/test/test_zany_mapping.py b/test/finat/test_zany_mapping.py
similarity index 100%
rename from test/test_zany_mapping.py
rename to test/finat/test_zany_mapping.py