diff --git a/docs/api.md b/docs/api/index.md
similarity index 87%
rename from docs/api.md
rename to docs/api/index.md
index f4f39a7..ff9b9df 100644
--- a/docs/api.md
+++ b/docs/api/index.md
@@ -8,7 +8,7 @@ your authorization token via the `Authorization` header.
 ## Endpoints
 
 ```eval_rst
-.. openapi:: ../goodtablesio/schemas/openapi-v1.yml
+.. openapi:: ../../goodtablesio/schemas/openapi-v1.yml
 ```
 
 
diff --git a/docs/goodtables_yml.md b/docs/configuration/goodtables_yml.md
similarity index 100%
rename from docs/goodtables_yml.md
rename to docs/configuration/goodtables_yml.md
diff --git a/docs/configuring.md b/docs/configuration/index.md
similarity index 100%
rename from docs/configuring.md
rename to docs/configuration/index.md
diff --git a/docs/getting_started_github.md b/docs/getting_started/github.md
similarity index 100%
rename from docs/getting_started_github.md
rename to docs/getting_started/github.md
diff --git a/docs/getting_started.md b/docs/getting_started/index.md
similarity index 64%
rename from docs/getting_started.md
rename to docs/getting_started/index.md
index 279f913..22356e4 100644
--- a/docs/getting_started.md
+++ b/docs/getting_started/index.md
@@ -4,7 +4,7 @@
 .. toctree::
    :maxdepth: 2
 
-   getting_started_github
-   getting_started_s3
+   github
+   s3
    writing_data_schema
 ```
diff --git a/docs/getting_started_s3.md b/docs/getting_started/s3.md
similarity index 100%
rename from docs/getting_started_s3.md
rename to docs/getting_started/s3.md
diff --git a/docs/writing_data_schema.md b/docs/getting_started/writing_data_schema.md
similarity index 100%
rename from docs/writing_data_schema.md
rename to docs/getting_started/writing_data_schema.md
diff --git a/docs/index.md b/docs/index.md
index a0a797f..e09e192 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -29,10 +29,10 @@ data is free from these types of errors.
 .. toctree::
    :maxdepth: 2
 
-   getting_started
-   configuring
-   goodtables_yml
-   api
+   getting_started/index
+   configuration/index
+   configuration/goodtables_yml
+   api/index
 ```