diff --git a/Dockerfile.debian-8 b/debian-8/Dockerfile
similarity index 100%
rename from Dockerfile.debian-8
rename to debian-8/Dockerfile
diff --git a/Dockerfile.fedora-24 b/fedora-24/Dockerfile
similarity index 100%
rename from Dockerfile.fedora-24
rename to fedora-24/Dockerfile
diff --git a/Dockerfile.ubuntu-16.04 b/ubuntu-16.04/Dockerfile
similarity index 100%
rename from Dockerfile.ubuntu-16.04
rename to ubuntu-16.04/Dockerfile