diff --git a/core/cruncher.go b/cruncher/cruncher.go
similarity index 93%
rename from core/cruncher.go
rename to cruncher/cruncher.go
index fceda00a9..ceef6a8ce 100644
--- a/core/cruncher.go
+++ b/cruncher/cruncher.go
@@ -1,4 +1,4 @@
-package core
+package cruncher
 
 import (
     "github.com/davecgh/go-spew/spew"
@@ -7,7 +7,7 @@ import (
 
 
 type Cruncher struct {
- close_chan chan bool
+    close_chan chan bool
 }
 
 func (cruncher *Cruncher) Run(port int) {
diff --git a/core/cruncher_test.go b/cruncher/cruncher_test.go
similarity index 97%
rename from core/cruncher_test.go
rename to cruncher/cruncher_test.go
index 9d0b42df3..b38ac3b6e 100644
--- a/core/cruncher_test.go
+++ b/cruncher/cruncher_test.go
@@ -1,4 +1,4 @@
-package core
+package cruncher
 
 import (
     "testing"