diff --git a/Solver/Solver.go b/Solver/Solver.go
deleted file mode 100644
index 5915403..0000000
--- a/Solver/Solver.go
+++ /dev/null
@@ -1,4 +0,0 @@
-package Solver
-
-type SudokuSolver struct {
-}
diff --git a/SudokuValidator/Solver.go b/SudokuValidator/Solver.go
new file mode 100644
index 0000000..b5a2bbf
--- /dev/null
+++ b/SudokuValidator/Solver.go
@@ -0,0 +1,10 @@
+package SudokuValidator
+
+type SudokuSolver struct {
+	Validator *SudokuValidator
+}
+
+func NewSudokuSolver() *SudokuSolver {
+	solver := &SudokuSolver{Validator: NewSudokuValidator()}
+	return solver
+}
diff --git a/main.go b/main.go
index 0da3abd..e208047 100644
--- a/main.go
+++ b/main.go
@@ -31,11 +31,12 @@ func main() {
 		{'.', '.', '.', '.', '8', '.', '.', '7', '9'},
 	}
 	tick := time.Tick(time.Millisecond)
-
-	validator := SudokuValidator.NewSudokuValidator()
 	start := <-tick
-	fmt.Println("Example 1 is valid:", validator.IsValidSudoku(&board1))
-	fmt.Println("Example 2 is valid:", validator.IsValidSudoku(&board2))
+
+	solver := SudokuValidator.NewSudokuSolver()
+	fmt.Println("Example 1 is valid:", solver.Validator.IsValidSudoku(&board1))
+	fmt.Println("Example 2 is valid:", solver.Validator.IsValidSudoku(&board2))
+
 	end := <-tick
 	elapsed := end.Sub(start)
 	fmt.Println("Time elapsed:", elapsed.Microseconds(), "microseconds")