diff --git a/Lectures/L26_SpecificationQuality/SpecificationQuality.pdf b/Lectures/L24_SpecificationQuality/SpecificationQuality.pdf
similarity index 100%
rename from Lectures/L26_SpecificationQuality/SpecificationQuality.pdf
rename to Lectures/L24_SpecificationQuality/SpecificationQuality.pdf
diff --git a/Lectures/L26_SpecificationQuality/SpecificationQuality.tex b/Lectures/L24_SpecificationQuality/SpecificationQuality.tex
similarity index 100%
rename from Lectures/L26_SpecificationQuality/SpecificationQuality.tex
rename to Lectures/L24_SpecificationQuality/SpecificationQuality.tex
diff --git a/Lectures/L27_EnglishToMath/EnglishToMath.pdf b/Lectures/L25_EnglishToMath/EnglishToMath.pdf
similarity index 100%
rename from Lectures/L27_EnglishToMath/EnglishToMath.pdf
rename to Lectures/L25_EnglishToMath/EnglishToMath.pdf
diff --git a/Lectures/L27_EnglishToMath/EnglishToMath.tex b/Lectures/L25_EnglishToMath/EnglishToMath.tex
similarity index 100%
rename from Lectures/L27_EnglishToMath/EnglishToMath.tex
rename to Lectures/L25_EnglishToMath/EnglishToMath.tex
diff --git a/Lectures/L24_GenericsAndInterfacesInJava/GenericsAndInterfacesInJava.pdf b/Lectures/L26_TemplatesInCpp/GenericsAndInterfacesInJava.pdf
similarity index 100%
rename from Lectures/L24_GenericsAndInterfacesInJava/GenericsAndInterfacesInJava.pdf
rename to Lectures/L26_TemplatesInCpp/GenericsAndInterfacesInJava.pdf
diff --git a/Lectures/L24_GenericsAndInterfacesInJava/GenericsAndInterfacesInJava.tex b/Lectures/L26_TemplatesInCpp/GenericsAndInterfacesInJava.tex
similarity index 100%
rename from Lectures/L24_GenericsAndInterfacesInJava/GenericsAndInterfacesInJava.tex
rename to Lectures/L26_TemplatesInCpp/GenericsAndInterfacesInJava.tex
diff --git a/Lectures/L24_GenericsAndInterfacesInJava/src/AllTests.java b/Lectures/L26_TemplatesInCpp/src/AllTests.java
similarity index 100%
rename from Lectures/L24_GenericsAndInterfacesInJava/src/AllTests.java
rename to Lectures/L26_TemplatesInCpp/src/AllTests.java
diff --git a/Lectures/L24_GenericsAndInterfacesInJava/src/FullException.java b/Lectures/L26_TemplatesInCpp/src/FullException.java
similarity index 100%
rename from Lectures/L24_GenericsAndInterfacesInJava/src/FullException.java
rename to Lectures/L26_TemplatesInCpp/src/FullException.java
diff --git a/Lectures/L24_GenericsAndInterfacesInJava/src/GenericSet.java b/Lectures/L26_TemplatesInCpp/src/GenericSet.java
similarity index 100%
rename from Lectures/L24_GenericsAndInterfacesInJava/src/GenericSet.java
rename to Lectures/L26_TemplatesInCpp/src/GenericSet.java
diff --git a/Lectures/L24_GenericsAndInterfacesInJava/src/IntegerSet.java b/Lectures/L26_TemplatesInCpp/src/IntegerSet.java
similarity index 100%
rename from Lectures/L24_GenericsAndInterfacesInJava/src/IntegerSet.java
rename to Lectures/L26_TemplatesInCpp/src/IntegerSet.java
diff --git a/Lectures/L24_GenericsAndInterfacesInJava/src/Makefile b/Lectures/L26_TemplatesInCpp/src/Makefile
similarity index 100%
rename from Lectures/L24_GenericsAndInterfacesInJava/src/Makefile
rename to Lectures/L26_TemplatesInCpp/src/Makefile
diff --git a/Lectures/L24_GenericsAndInterfacesInJava/src/MemberException.java b/Lectures/L26_TemplatesInCpp/src/MemberException.java
similarity index 100%
rename from Lectures/L24_GenericsAndInterfacesInJava/src/MemberException.java
rename to Lectures/L26_TemplatesInCpp/src/MemberException.java
diff --git a/Lectures/L24_GenericsAndInterfacesInJava/src/NotMemberException.java b/Lectures/L26_TemplatesInCpp/src/NotMemberException.java
similarity index 100%
rename from Lectures/L24_GenericsAndInterfacesInJava/src/NotMemberException.java
rename to Lectures/L26_TemplatesInCpp/src/NotMemberException.java
diff --git a/Lectures/L24_GenericsAndInterfacesInJava/src/TestIntegerSet.java b/Lectures/L26_TemplatesInCpp/src/TestIntegerSet.java
similarity index 100%
rename from Lectures/L24_GenericsAndInterfacesInJava/src/TestIntegerSet.java
rename to Lectures/L26_TemplatesInCpp/src/TestIntegerSet.java
diff --git a/Lectures/L24_GenericsAndInterfacesInJava/src/TestVectorTSet.java b/Lectures/L26_TemplatesInCpp/src/TestVectorTSet.java
similarity index 100%
rename from Lectures/L24_GenericsAndInterfacesInJava/src/TestVectorTSet.java
rename to Lectures/L26_TemplatesInCpp/src/TestVectorTSet.java
diff --git a/Lectures/L24_GenericsAndInterfacesInJava/src/VectorT.java b/Lectures/L26_TemplatesInCpp/src/VectorT.java
similarity index 100%
rename from Lectures/L24_GenericsAndInterfacesInJava/src/VectorT.java
rename to Lectures/L26_TemplatesInCpp/src/VectorT.java
diff --git a/Lectures/L24_GenericsAndInterfacesInJava/src/VectorTSet.java b/Lectures/L26_TemplatesInCpp/src/VectorTSet.java
similarity index 100%
rename from Lectures/L24_GenericsAndInterfacesInJava/src/VectorTSet.java
rename to Lectures/L26_TemplatesInCpp/src/VectorTSet.java
diff --git a/Lectures/L24_GenericsAndInterfacesInJava/srcComparable/AllTests.java b/Lectures/L26_TemplatesInCpp/srcComparable/AllTests.java
similarity index 100%
rename from Lectures/L24_GenericsAndInterfacesInJava/srcComparable/AllTests.java
rename to Lectures/L26_TemplatesInCpp/srcComparable/AllTests.java
diff --git a/Lectures/L24_GenericsAndInterfacesInJava/srcComparable/FullException.java b/Lectures/L26_TemplatesInCpp/srcComparable/FullException.java
similarity index 100%
rename from Lectures/L24_GenericsAndInterfacesInJava/srcComparable/FullException.java
rename to Lectures/L26_TemplatesInCpp/srcComparable/FullException.java
diff --git a/Lectures/L24_GenericsAndInterfacesInJava/srcComparable/GenericSet.java b/Lectures/L26_TemplatesInCpp/srcComparable/GenericSet.java
similarity index 100%
rename from Lectures/L24_GenericsAndInterfacesInJava/srcComparable/GenericSet.java
rename to Lectures/L26_TemplatesInCpp/srcComparable/GenericSet.java
diff --git a/Lectures/L24_GenericsAndInterfacesInJava/srcComparable/IntegerSet.java b/Lectures/L26_TemplatesInCpp/srcComparable/IntegerSet.java
similarity index 100%
rename from Lectures/L24_GenericsAndInterfacesInJava/srcComparable/IntegerSet.java
rename to Lectures/L26_TemplatesInCpp/srcComparable/IntegerSet.java
diff --git a/Lectures/L24_GenericsAndInterfacesInJava/srcComparable/Makefile b/Lectures/L26_TemplatesInCpp/srcComparable/Makefile
similarity index 100%
rename from Lectures/L24_GenericsAndInterfacesInJava/srcComparable/Makefile
rename to Lectures/L26_TemplatesInCpp/srcComparable/Makefile
diff --git a/Lectures/L24_GenericsAndInterfacesInJava/srcComparable/MemberException.java b/Lectures/L26_TemplatesInCpp/srcComparable/MemberException.java
similarity index 100%
rename from Lectures/L24_GenericsAndInterfacesInJava/srcComparable/MemberException.java
rename to Lectures/L26_TemplatesInCpp/srcComparable/MemberException.java
diff --git a/Lectures/L24_GenericsAndInterfacesInJava/srcComparable/NotMemberException.java b/Lectures/L26_TemplatesInCpp/srcComparable/NotMemberException.java
similarity index 100%
rename from Lectures/L24_GenericsAndInterfacesInJava/srcComparable/NotMemberException.java
rename to Lectures/L26_TemplatesInCpp/srcComparable/NotMemberException.java
diff --git a/Lectures/L24_GenericsAndInterfacesInJava/srcComparable/TestIntegerSet.java b/Lectures/L26_TemplatesInCpp/srcComparable/TestIntegerSet.java
similarity index 100%
rename from Lectures/L24_GenericsAndInterfacesInJava/srcComparable/TestIntegerSet.java
rename to Lectures/L26_TemplatesInCpp/srcComparable/TestIntegerSet.java
diff --git a/Lectures/L24_GenericsAndInterfacesInJava/srcComparable/TestVectorTSet.java b/Lectures/L26_TemplatesInCpp/srcComparable/TestVectorTSet.java
similarity index 100%
rename from Lectures/L24_GenericsAndInterfacesInJava/srcComparable/TestVectorTSet.java
rename to Lectures/L26_TemplatesInCpp/srcComparable/TestVectorTSet.java
diff --git a/Lectures/L24_GenericsAndInterfacesInJava/srcComparable/VectorT.java b/Lectures/L26_TemplatesInCpp/srcComparable/VectorT.java
similarity index 100%
rename from Lectures/L24_GenericsAndInterfacesInJava/srcComparable/VectorT.java
rename to Lectures/L26_TemplatesInCpp/srcComparable/VectorT.java
diff --git a/Lectures/L24_GenericsAndInterfacesInJava/srcComparable/VectorTSet.java b/Lectures/L26_TemplatesInCpp/srcComparable/VectorTSet.java
similarity index 100%
rename from Lectures/L24_GenericsAndInterfacesInJava/srcComparable/VectorTSet.java
rename to Lectures/L26_TemplatesInCpp/srcComparable/VectorTSet.java
diff --git a/Lectures/L24_GenericsAndInterfacesInJava/srcEquality/AllTests.java b/Lectures/L26_TemplatesInCpp/srcEquality/AllTests.java
similarity index 100%
rename from Lectures/L24_GenericsAndInterfacesInJava/srcEquality/AllTests.java
rename to Lectures/L26_TemplatesInCpp/srcEquality/AllTests.java
diff --git a/Lectures/L24_GenericsAndInterfacesInJava/srcEquality/FullException.java b/Lectures/L26_TemplatesInCpp/srcEquality/FullException.java
similarity index 100%
rename from Lectures/L24_GenericsAndInterfacesInJava/srcEquality/FullException.java
rename to Lectures/L26_TemplatesInCpp/srcEquality/FullException.java
diff --git a/Lectures/L24_GenericsAndInterfacesInJava/srcEquality/GenericSet.java b/Lectures/L26_TemplatesInCpp/srcEquality/GenericSet.java
similarity index 100%
rename from Lectures/L24_GenericsAndInterfacesInJava/srcEquality/GenericSet.java
rename to Lectures/L26_TemplatesInCpp/srcEquality/GenericSet.java
diff --git a/Lectures/L24_GenericsAndInterfacesInJava/srcEquality/IntegerSet.java b/Lectures/L26_TemplatesInCpp/srcEquality/IntegerSet.java
similarity index 100%
rename from Lectures/L24_GenericsAndInterfacesInJava/srcEquality/IntegerSet.java
rename to Lectures/L26_TemplatesInCpp/srcEquality/IntegerSet.java
diff --git a/Lectures/L24_GenericsAndInterfacesInJava/srcEquality/Makefile b/Lectures/L26_TemplatesInCpp/srcEquality/Makefile
similarity index 100%
rename from Lectures/L24_GenericsAndInterfacesInJava/srcEquality/Makefile
rename to Lectures/L26_TemplatesInCpp/srcEquality/Makefile
diff --git a/Lectures/L24_GenericsAndInterfacesInJava/srcEquality/MemberException.java b/Lectures/L26_TemplatesInCpp/srcEquality/MemberException.java
similarity index 100%
rename from Lectures/L24_GenericsAndInterfacesInJava/srcEquality/MemberException.java
rename to Lectures/L26_TemplatesInCpp/srcEquality/MemberException.java
diff --git a/Lectures/L24_GenericsAndInterfacesInJava/srcEquality/NotMemberException.java b/Lectures/L26_TemplatesInCpp/srcEquality/NotMemberException.java
similarity index 100%
rename from Lectures/L24_GenericsAndInterfacesInJava/srcEquality/NotMemberException.java
rename to Lectures/L26_TemplatesInCpp/srcEquality/NotMemberException.java
diff --git a/Lectures/L24_GenericsAndInterfacesInJava/srcEquality/TestIntegerSet.java b/Lectures/L26_TemplatesInCpp/srcEquality/TestIntegerSet.java
similarity index 100%
rename from Lectures/L24_GenericsAndInterfacesInJava/srcEquality/TestIntegerSet.java
rename to Lectures/L26_TemplatesInCpp/srcEquality/TestIntegerSet.java
diff --git a/Lectures/L24_GenericsAndInterfacesInJava/srcEquality/TestVectorTSet.java b/Lectures/L26_TemplatesInCpp/srcEquality/TestVectorTSet.java
similarity index 100%
rename from Lectures/L24_GenericsAndInterfacesInJava/srcEquality/TestVectorTSet.java
rename to Lectures/L26_TemplatesInCpp/srcEquality/TestVectorTSet.java
diff --git a/Lectures/L24_GenericsAndInterfacesInJava/srcEquality/VectorT.java b/Lectures/L26_TemplatesInCpp/srcEquality/VectorT.java
similarity index 100%
rename from Lectures/L24_GenericsAndInterfacesInJava/srcEquality/VectorT.java
rename to Lectures/L26_TemplatesInCpp/srcEquality/VectorT.java
diff --git a/Lectures/L24_GenericsAndInterfacesInJava/srcEquality/VectorTSet.java b/Lectures/L26_TemplatesInCpp/srcEquality/VectorTSet.java
similarity index 100%
rename from Lectures/L24_GenericsAndInterfacesInJava/srcEquality/VectorTSet.java
rename to Lectures/L26_TemplatesInCpp/srcEquality/VectorTSet.java
diff --git a/Lectures/L25_SpecViaUML/SpecViaUML.pdf b/Lectures/L27_SpecViaUML/SpecViaUML.pdf
similarity index 100%
rename from Lectures/L25_SpecViaUML/SpecViaUML.pdf
rename to Lectures/L27_SpecViaUML/SpecViaUML.pdf
diff --git a/Lectures/L25_SpecViaUML/SpecViaUML.tex b/Lectures/L27_SpecViaUML/SpecViaUML.tex
similarity index 100%
rename from Lectures/L25_SpecViaUML/SpecViaUML.tex
rename to Lectures/L27_SpecViaUML/SpecViaUML.tex
diff --git a/Lectures/L25_SpecViaUML/src/BankAccount.java b/Lectures/L27_SpecViaUML/src/BankAccount.java
similarity index 100%
rename from Lectures/L25_SpecViaUML/src/BankAccount.java
rename to Lectures/L27_SpecViaUML/src/BankAccount.java
diff --git a/Lectures/L25_SpecViaUML/src/BankAccountInterface.java b/Lectures/L27_SpecViaUML/src/BankAccountInterface.java
similarity index 100%
rename from Lectures/L25_SpecViaUML/src/BankAccountInterface.java
rename to Lectures/L27_SpecViaUML/src/BankAccountInterface.java
diff --git a/Lectures/L25_SpecViaUML/src/DataSet.java b/Lectures/L27_SpecViaUML/src/DataSet.java
similarity index 100%
rename from Lectures/L25_SpecViaUML/src/DataSet.java
rename to Lectures/L27_SpecViaUML/src/DataSet.java
diff --git a/Lectures/L25_SpecViaUML/src/DataSetBankAccount.java b/Lectures/L27_SpecViaUML/src/DataSetBankAccount.java
similarity index 100%
rename from Lectures/L25_SpecViaUML/src/DataSetBankAccount.java
rename to Lectures/L27_SpecViaUML/src/DataSetBankAccount.java
diff --git a/Lectures/L25_SpecViaUML/src/DataSetInterface.java b/Lectures/L27_SpecViaUML/src/DataSetInterface.java
similarity index 100%
rename from Lectures/L25_SpecViaUML/src/DataSetInterface.java
rename to Lectures/L27_SpecViaUML/src/DataSetInterface.java
diff --git a/Lectures/L25_SpecViaUML/src/DataSetPoint.java b/Lectures/L27_SpecViaUML/src/DataSetPoint.java
similarity index 100%
rename from Lectures/L25_SpecViaUML/src/DataSetPoint.java
rename to Lectures/L27_SpecViaUML/src/DataSetPoint.java
diff --git a/Lectures/L25_SpecViaUML/src/DataSetStrategy.java b/Lectures/L27_SpecViaUML/src/DataSetStrategy.java
similarity index 100%
rename from Lectures/L25_SpecViaUML/src/DataSetStrategy.java
rename to Lectures/L27_SpecViaUML/src/DataSetStrategy.java
diff --git a/Lectures/L25_SpecViaUML/src/DataSetStrategyTest.java b/Lectures/L27_SpecViaUML/src/DataSetStrategyTest.java
similarity index 100%
rename from Lectures/L25_SpecViaUML/src/DataSetStrategyTest.java
rename to Lectures/L27_SpecViaUML/src/DataSetStrategyTest.java
diff --git a/Lectures/L25_SpecViaUML/src/DataSetTest.java b/Lectures/L27_SpecViaUML/src/DataSetTest.java
similarity index 100%
rename from Lectures/L25_SpecViaUML/src/DataSetTest.java
rename to Lectures/L27_SpecViaUML/src/DataSetTest.java
diff --git a/Lectures/L25_SpecViaUML/src/Measurable.java b/Lectures/L27_SpecViaUML/src/Measurable.java
similarity index 100%
rename from Lectures/L25_SpecViaUML/src/Measurable.java
rename to Lectures/L27_SpecViaUML/src/Measurable.java
diff --git a/Lectures/L25_SpecViaUML/src/Measurer.java b/Lectures/L27_SpecViaUML/src/Measurer.java
similarity index 100%
rename from Lectures/L25_SpecViaUML/src/Measurer.java
rename to Lectures/L27_SpecViaUML/src/Measurer.java
diff --git a/Lectures/L25_SpecViaUML/src/PointT.java b/Lectures/L27_SpecViaUML/src/PointT.java
similarity index 100%
rename from Lectures/L25_SpecViaUML/src/PointT.java
rename to Lectures/L27_SpecViaUML/src/PointT.java
diff --git a/Lectures/L25_SpecViaUML/src/PointTInterface.java b/Lectures/L27_SpecViaUML/src/PointTInterface.java
similarity index 100%
rename from Lectures/L25_SpecViaUML/src/PointTInterface.java
rename to Lectures/L27_SpecViaUML/src/PointTInterface.java
diff --git a/Lectures/L25_SpecViaUML/src/RectangleMeasurer.java b/Lectures/L27_SpecViaUML/src/RectangleMeasurer.java
similarity index 100%
rename from Lectures/L25_SpecViaUML/src/RectangleMeasurer.java
rename to Lectures/L27_SpecViaUML/src/RectangleMeasurer.java
diff --git a/Lectures/L25_SpecViaUML/src/TestArraysSortComparable.java b/Lectures/L27_SpecViaUML/src/TestArraysSortComparable.java
similarity index 100%
rename from Lectures/L25_SpecViaUML/src/TestArraysSortComparable.java
rename to Lectures/L27_SpecViaUML/src/TestArraysSortComparable.java