diff --git a/Src/IACore/imp/inl/iacore/StreamReader/Interface/StreamReader.interface.inl b/Src/IACore/imp/inl/IACore/StreamReader/Interface/StreamReader.interface.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/StreamReader/Interface/StreamReader.interface.inl
rename to Src/IACore/imp/inl/IACore/StreamReader/Interface/StreamReader.interface.inl
diff --git a/Src/IACore/imp/inl/iacore/StreamReader/StreamReader.inl b/Src/IACore/imp/inl/IACore/StreamReader/StreamReader.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/StreamReader/StreamReader.inl
rename to Src/IACore/imp/inl/IACore/StreamReader/StreamReader.inl
diff --git a/Src/IACore/imp/inl/iacore/algorithm/binary-search.inl b/Src/IACore/imp/inl/IACore/algorithm/binary-search.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/algorithm/binary-search.inl
rename to Src/IACore/imp/inl/IACore/algorithm/binary-search.inl
diff --git a/Src/IACore/imp/inl/iacore/algorithm/interface/binary-search.interface.inl b/Src/IACore/imp/inl/IACore/algorithm/interface/binary-search.interface.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/algorithm/interface/binary-search.interface.inl
rename to Src/IACore/imp/inl/IACore/algorithm/interface/binary-search.interface.inl
diff --git a/Src/IACore/imp/inl/iacore/algorithm/interface/quick-sort.interface.inl b/Src/IACore/imp/inl/IACore/algorithm/interface/quick-sort.interface.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/algorithm/interface/quick-sort.interface.inl
rename to Src/IACore/imp/inl/IACore/algorithm/interface/quick-sort.interface.inl
diff --git a/Src/IACore/imp/inl/iacore/algorithm/quick-sort.inl b/Src/IACore/imp/inl/IACore/algorithm/quick-sort.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/algorithm/quick-sort.inl
rename to Src/IACore/imp/inl/IACore/algorithm/quick-sort.inl
diff --git a/Src/IACore/imp/inl/iacore/array/array.inl b/Src/IACore/imp/inl/IACore/array/array.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/array/array.inl
rename to Src/IACore/imp/inl/IACore/array/array.inl
diff --git a/Src/IACore/imp/inl/iacore/array/interface/array.interface.inl b/Src/IACore/imp/inl/IACore/array/interface/array.interface.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/array/interface/array.interface.inl
rename to Src/IACore/imp/inl/IACore/array/interface/array.interface.inl
diff --git a/Src/IACore/imp/inl/iacore/bytestring/bytestring.inl b/Src/IACore/imp/inl/IACore/bytestring/bytestring.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/bytestring/bytestring.inl
rename to Src/IACore/imp/inl/IACore/bytestring/bytestring.inl
diff --git a/Src/IACore/imp/inl/iacore/bytestring/interface/bytestring.interface.inl b/Src/IACore/imp/inl/IACore/bytestring/interface/bytestring.interface.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/bytestring/interface/bytestring.interface.inl
rename to Src/IACore/imp/inl/IACore/bytestring/interface/bytestring.interface.inl
diff --git a/Src/IACore/imp/inl/iacore/container/dynamic.inl b/Src/IACore/imp/inl/IACore/container/dynamic.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/container/dynamic.inl
rename to Src/IACore/imp/inl/IACore/container/dynamic.inl
diff --git a/Src/IACore/imp/inl/iacore/container/fixed.inl b/Src/IACore/imp/inl/IACore/container/fixed.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/container/fixed.inl
rename to Src/IACore/imp/inl/IACore/container/fixed.inl
diff --git a/Src/IACore/imp/inl/iacore/container/interface/dynamic.interface.inl b/Src/IACore/imp/inl/IACore/container/interface/dynamic.interface.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/container/interface/dynamic.interface.inl
rename to Src/IACore/imp/inl/IACore/container/interface/dynamic.interface.inl
diff --git a/Src/IACore/imp/inl/iacore/container/interface/fixed.interface.inl b/Src/IACore/imp/inl/IACore/container/interface/fixed.interface.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/container/interface/fixed.interface.inl
rename to Src/IACore/imp/inl/IACore/container/interface/fixed.interface.inl
diff --git a/Src/IACore/imp/inl/iacore/container/interface/iterator.interface.inl b/Src/IACore/imp/inl/IACore/container/interface/iterator.interface.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/container/interface/iterator.interface.inl
rename to Src/IACore/imp/inl/IACore/container/interface/iterator.interface.inl
diff --git a/Src/IACore/imp/inl/iacore/container/interface/span.interface.inl b/Src/IACore/imp/inl/IACore/container/interface/span.interface.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/container/interface/span.interface.inl
rename to Src/IACore/imp/inl/IACore/container/interface/span.interface.inl
diff --git a/Src/IACore/imp/inl/iacore/container/iterator.inl b/Src/IACore/imp/inl/IACore/container/iterator.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/container/iterator.inl
rename to Src/IACore/imp/inl/IACore/container/iterator.inl
diff --git a/Src/IACore/imp/inl/iacore/container/span.inl b/Src/IACore/imp/inl/IACore/container/span.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/container/span.inl
rename to Src/IACore/imp/inl/IACore/container/span.inl
diff --git a/Src/IACore/imp/inl/iacore/hashable/iihashable.inl b/Src/IACore/imp/inl/IACore/hashable/iihashable.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/hashable/iihashable.inl
rename to Src/IACore/imp/inl/IACore/hashable/iihashable.inl
diff --git a/Src/IACore/imp/inl/iacore/hashable/interface/iihashable.interface.inl b/Src/IACore/imp/inl/IACore/hashable/interface/iihashable.interface.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/hashable/interface/iihashable.interface.inl
rename to Src/IACore/imp/inl/IACore/hashable/interface/iihashable.interface.inl
diff --git a/Src/IACore/imp/inl/iacore/iterator/interface/iterator.interface.inl b/Src/IACore/imp/inl/IACore/iterator/interface/iterator.interface.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/iterator/interface/iterator.interface.inl
rename to Src/IACore/imp/inl/IACore/iterator/interface/iterator.interface.inl
diff --git a/Src/IACore/imp/inl/iacore/iterator/iterator.inl b/Src/IACore/imp/inl/IACore/iterator/iterator.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/iterator/iterator.inl
rename to Src/IACore/imp/inl/IACore/iterator/iterator.inl
diff --git a/Src/IACore/imp/inl/iacore/lib/interface/math.interface.inl b/Src/IACore/imp/inl/IACore/lib/interface/math.interface.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/lib/interface/math.interface.inl
rename to Src/IACore/imp/inl/IACore/lib/interface/math.interface.inl
diff --git a/Src/IACore/imp/inl/iacore/lib/interface/mem.interface.inl b/Src/IACore/imp/inl/IACore/lib/interface/mem.interface.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/lib/interface/mem.interface.inl
rename to Src/IACore/imp/inl/IACore/lib/interface/mem.interface.inl
diff --git a/Src/IACore/imp/inl/iacore/lib/interface/str.interface.inl b/Src/IACore/imp/inl/IACore/lib/interface/str.interface.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/lib/interface/str.interface.inl
rename to Src/IACore/imp/inl/IACore/lib/interface/str.interface.inl
diff --git a/Src/IACore/imp/inl/iacore/lib/math.inl b/Src/IACore/imp/inl/IACore/lib/math.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/lib/math.inl
rename to Src/IACore/imp/inl/IACore/lib/math.inl
diff --git a/Src/IACore/imp/inl/iacore/lib/mem.inl b/Src/IACore/imp/inl/IACore/lib/mem.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/lib/mem.inl
rename to Src/IACore/imp/inl/IACore/lib/mem.inl
diff --git a/Src/IACore/imp/inl/iacore/lib/str.inl b/Src/IACore/imp/inl/IACore/lib/str.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/lib/str.inl
rename to Src/IACore/imp/inl/IACore/lib/str.inl
diff --git a/Src/IACore/imp/inl/iacore/list/entry.inl b/Src/IACore/imp/inl/IACore/list/entry.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/list/entry.inl
rename to Src/IACore/imp/inl/IACore/list/entry.inl
diff --git a/Src/IACore/imp/inl/iacore/list/interface/entry.interface.inl b/Src/IACore/imp/inl/IACore/list/interface/entry.interface.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/list/interface/entry.interface.inl
rename to Src/IACore/imp/inl/IACore/list/interface/entry.interface.inl
diff --git a/Src/IACore/imp/inl/iacore/list/interface/list.interface.inl b/Src/IACore/imp/inl/IACore/list/interface/list.interface.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/list/interface/list.interface.inl
rename to Src/IACore/imp/inl/IACore/list/interface/list.interface.inl
diff --git a/Src/IACore/imp/inl/iacore/list/list.inl b/Src/IACore/imp/inl/IACore/list/list.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/list/list.inl
rename to Src/IACore/imp/inl/IACore/list/list.inl
diff --git a/Src/IACore/imp/inl/iacore/map/interface/map.interface.inl b/Src/IACore/imp/inl/IACore/map/interface/map.interface.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/map/interface/map.interface.inl
rename to Src/IACore/imp/inl/IACore/map/interface/map.interface.inl
diff --git a/Src/IACore/imp/inl/iacore/map/map.inl b/Src/IACore/imp/inl/IACore/map/map.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/map/map.inl
rename to Src/IACore/imp/inl/IACore/map/map.inl
diff --git a/Src/IACore/imp/inl/iacore/memory/allocator/general.inl b/Src/IACore/imp/inl/IACore/memory/allocator/general.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/memory/allocator/general.inl
rename to Src/IACore/imp/inl/IACore/memory/allocator/general.inl
diff --git a/Src/IACore/imp/inl/iacore/memory/allocator/iiallocator.inl b/Src/IACore/imp/inl/IACore/memory/allocator/iiallocator.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/memory/allocator/iiallocator.inl
rename to Src/IACore/imp/inl/IACore/memory/allocator/iiallocator.inl
diff --git a/Src/IACore/imp/inl/iacore/memory/allocator/interface/general.interface.inl b/Src/IACore/imp/inl/IACore/memory/allocator/interface/general.interface.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/memory/allocator/interface/general.interface.inl
rename to Src/IACore/imp/inl/IACore/memory/allocator/interface/general.interface.inl
diff --git a/Src/IACore/imp/inl/iacore/memory/allocator/interface/iiallocator.interface.inl b/Src/IACore/imp/inl/IACore/memory/allocator/interface/iiallocator.interface.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/memory/allocator/interface/iiallocator.interface.inl
rename to Src/IACore/imp/inl/IACore/memory/allocator/interface/iiallocator.interface.inl
diff --git a/Src/IACore/imp/inl/iacore/memory/allocator/interface/orchestrator.interface.inl b/Src/IACore/imp/inl/IACore/memory/allocator/interface/orchestrator.interface.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/memory/allocator/interface/orchestrator.interface.inl
rename to Src/IACore/imp/inl/IACore/memory/allocator/interface/orchestrator.interface.inl
diff --git a/Src/IACore/imp/inl/iacore/memory/allocator/orchestrator.inl b/Src/IACore/imp/inl/IACore/memory/allocator/orchestrator.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/memory/allocator/orchestrator.inl
rename to Src/IACore/imp/inl/IACore/memory/allocator/orchestrator.inl
diff --git a/Src/IACore/imp/inl/iacore/memory/ptr/interface/refptr.interface.inl b/Src/IACore/imp/inl/IACore/memory/ptr/interface/refptr.interface.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/memory/ptr/interface/refptr.interface.inl
rename to Src/IACore/imp/inl/IACore/memory/ptr/interface/refptr.interface.inl
diff --git a/Src/IACore/imp/inl/iacore/platform/interface/platform.interface.inl b/Src/IACore/imp/inl/IACore/platform/interface/platform.interface.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/platform/interface/platform.interface.inl
rename to Src/IACore/imp/inl/IACore/platform/interface/platform.interface.inl
diff --git a/Src/IACore/imp/inl/iacore/platform/platform.inl b/Src/IACore/imp/inl/IACore/platform/platform.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/platform/platform.inl
rename to Src/IACore/imp/inl/IACore/platform/platform.inl
diff --git a/Src/IACore/imp/inl/iacore/set/interface/set.interface.inl b/Src/IACore/imp/inl/IACore/set/interface/set.interface.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/set/interface/set.interface.inl
rename to Src/IACore/imp/inl/IACore/set/interface/set.interface.inl
diff --git a/Src/IACore/imp/inl/iacore/set/set.inl b/Src/IACore/imp/inl/IACore/set/set.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/set/set.inl
rename to Src/IACore/imp/inl/IACore/set/set.inl
diff --git a/Src/IACore/imp/inl/iacore/stream/filestream.inl b/Src/IACore/imp/inl/IACore/stream/filestream.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/stream/filestream.inl
rename to Src/IACore/imp/inl/IACore/stream/filestream.inl
diff --git a/Src/IACore/imp/inl/iacore/stream/interface/filestream.interface.inl b/Src/IACore/imp/inl/IACore/stream/interface/filestream.interface.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/stream/interface/filestream.interface.inl
rename to Src/IACore/imp/inl/IACore/stream/interface/filestream.interface.inl
diff --git a/Src/IACore/imp/inl/iacore/stream/interface/iistream.interface.inl b/Src/IACore/imp/inl/IACore/stream/interface/iistream.interface.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/stream/interface/iistream.interface.inl
rename to Src/IACore/imp/inl/IACore/stream/interface/iistream.interface.inl
diff --git a/Src/IACore/imp/inl/iacore/stream/interface/stringstream.interface.inl b/Src/IACore/imp/inl/IACore/stream/interface/stringstream.interface.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/stream/interface/stringstream.interface.inl
rename to Src/IACore/imp/inl/IACore/stream/interface/stringstream.interface.inl
diff --git a/Src/IACore/imp/inl/iacore/stream/stringstream.inl b/Src/IACore/imp/inl/IACore/stream/stringstream.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/stream/stringstream.inl
rename to Src/IACore/imp/inl/IACore/stream/stringstream.inl
diff --git a/Src/IACore/imp/inl/iacore/string/interface/string.interface.inl b/Src/IACore/imp/inl/IACore/string/interface/string.interface.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/string/interface/string.interface.inl
rename to Src/IACore/imp/inl/IACore/string/interface/string.interface.inl
diff --git a/Src/IACore/imp/inl/iacore/string/string.inl b/Src/IACore/imp/inl/IACore/string/string.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/string/string.inl
rename to Src/IACore/imp/inl/IACore/string/string.inl
diff --git a/Src/IACore/imp/inl/iacore/vector/interface/ordered.interface.inl b/Src/IACore/imp/inl/IACore/vector/interface/ordered.interface.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/vector/interface/ordered.interface.inl
rename to Src/IACore/imp/inl/IACore/vector/interface/ordered.interface.inl
diff --git a/Src/IACore/imp/inl/iacore/vector/interface/unordered.interface.inl b/Src/IACore/imp/inl/IACore/vector/interface/unordered.interface.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/vector/interface/unordered.interface.inl
rename to Src/IACore/imp/inl/IACore/vector/interface/unordered.interface.inl
diff --git a/Src/IACore/imp/inl/iacore/vector/ordered.inl b/Src/IACore/imp/inl/IACore/vector/ordered.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/vector/ordered.inl
rename to Src/IACore/imp/inl/IACore/vector/ordered.inl
diff --git a/Src/IACore/imp/inl/iacore/vector/unordered.inl b/Src/IACore/imp/inl/IACore/vector/unordered.inl
similarity index 100%
rename from Src/IACore/imp/inl/iacore/vector/unordered.inl
rename to Src/IACore/imp/inl/IACore/vector/unordered.inl