diff --git a/chapter-2/01_type_conversions.go b/chapter-2-primitive-types-and-declarations/01_type_conversions.go
similarity index 100%
rename from chapter-2/01_type_conversions.go
rename to chapter-2-primitive-types-and-declarations/01_type_conversions.go
diff --git a/chapter-2/02_declarations.go b/chapter-2-primitive-types-and-declarations/02_declarations.go
similarity index 100%
rename from chapter-2/02_declarations.go
rename to chapter-2-primitive-types-and-declarations/02_declarations.go
diff --git a/chapter-2/03_const.go b/chapter-2-primitive-types-and-declarations/03_const.go
similarity index 100%
rename from chapter-2/03_const.go
rename to chapter-2-primitive-types-and-declarations/03_const.go
diff --git a/chapter-2/04_unused_variables.go b/chapter-2-primitive-types-and-declarations/04_unused_variables.go
similarity index 100%
rename from chapter-2/04_unused_variables.go
rename to chapter-2-primitive-types-and-declarations/04_unused_variables.go
diff --git a/chapter-2/05_naming_variables_constants.go b/chapter-2-primitive-types-and-declarations/05_naming_variables_constants.go
similarity index 100%
rename from chapter-2/05_naming_variables_constants.go
rename to chapter-2-primitive-types-and-declarations/05_naming_variables_constants.go
diff --git a/chapter-3-composite-types/01_arrays.go b/chapter-3-composite-types/01_arrays.go
new file mode 100644
index 0000000..06ab7d0
--- /dev/null
+++ b/chapter-3-composite-types/01_arrays.go
@@ -0,0 +1 @@
+package main