diff --git a/exercises/15/15-compilation-linking.md b/exercises/15/build_files/15-compilation-linking.md
similarity index 100%
rename from exercises/15/15-compilation-linking.md
rename to exercises/15/build_files/15-compilation-linking.md
diff --git a/exercises/15/build_files/solution/Clyde.cpp b/exercises/15/build_files/solution/Clyde.cpp
new file mode 100644
index 0000000..bcf5f67
--- /dev/null
+++ b/exercises/15/build_files/solution/Clyde.cpp
@@ -0,0 +1 @@
+#include "Clyde.hpp"
diff --git a/exercises/15/build_files/solution/Clyde.hpp b/exercises/15/build_files/solution/Clyde.hpp
new file mode 100644
index 0000000..6f70f09
--- /dev/null
+++ b/exercises/15/build_files/solution/Clyde.hpp
@@ -0,0 +1 @@
+#pragma once
diff --git a/exercises/17/classes/17-classes-and-structs.md b/exercises/17/17-classes-and-structs.md
similarity index 100%
rename from exercises/17/classes/17-classes-and-structs.md
rename to exercises/17/17-classes-and-structs.md