diff --git a/06_builder/builder.go b/06_builder/builder.go
index 3d95fe7..5305d08 100644
--- a/06_builder/builder.go
+++ b/06_builder/builder.go
@@ -24,3 +24,43 @@ func (d *Director) Construct() {
 	d.builder.Part2()
 	d.builder.Part3()
 }
+
+type Builder1 struct {
+	result string
+}
+
+func (b *Builder1) Part1() {
+	b.result += "1"
+}
+
+func (b *Builder1) Part2() {
+	b.result += "2"
+}
+
+func (b *Builder1) Part3() {
+	b.result += "3"
+}
+
+func (b *Builder1) GetResult() string {
+	return b.result
+}
+
+type Builder2 struct {
+	result int
+}
+
+func (b *Builder2) Part1() {
+	b.result += 1
+}
+
+func (b *Builder2) Part2() {
+	b.result += 2
+}
+
+func (b *Builder2) Part3() {
+	b.result += 3
+}
+
+func (b *Builder2) GetResult() int {
+	return b.result
+}
diff --git a/06_builder/builder_test.go b/06_builder/builder_test.go
index ceb3cbe..ee24770 100644
--- a/06_builder/builder_test.go
+++ b/06_builder/builder_test.go
@@ -2,26 +2,6 @@ package builder
 
 import "testing"
 
-type Builder1 struct {
-	result string
-}
-
-func (b *Builder1) Part1() {
-	b.result += "1"
-}
-
-func (b *Builder1) Part2() {
-	b.result += "2"
-}
-
-func (b *Builder1) Part3() {
-	b.result += "3"
-}
-
-func (b *Builder1) GetResult() string {
-	return b.result
-}
-
 func TestBuilder1(t *testing.T) {
 	builder := &Builder1{}
 	director := NewDirector(builder)
@@ -32,26 +12,6 @@ func TestBuilder1(t *testing.T) {
 	}
 }
 
-type Builder2 struct {
-	result int
-}
-
-func (b *Builder2) Part1() {
-	b.result += 1
-}
-
-func (b *Builder2) Part2() {
-	b.result += 2
-}
-
-func (b *Builder2) Part3() {
-	b.result += 3
-}
-
-func (b *Builder2) GetResult() int {
-	return b.result
-}
-
 func TestBuilder2(t *testing.T) {
 	builder := &Builder2{}
 	director := NewDirector(builder)