diff --git a/cmd/htmlhouse/.gitignore b/cmd/htmlhouse/.gitignore
new file mode 100644
index 0000000..37fd3c8
--- /dev/null
+++ b/cmd/htmlhouse/.gitignore
@@ -0,0 +1 @@
+htmlhouse
\ No newline at end of file
diff --git a/main/main.go b/cmd/htmlhouse/main.go
similarity index 53%
rename from main/main.go
rename to cmd/htmlhouse/main.go
index 056796f..adaa2d6 100644
--- a/main/main.go
+++ b/cmd/htmlhouse/main.go
@@ -1,6 +1,8 @@
 package main
 
-import "github.com/writeas/htmlhouse"
+import (
+	"github.com/writeas/htmlhouse"
+)
 
 func main() {
 	htmlhouse.Serve()
diff --git a/main/.gitignore b/main/.gitignore
deleted file mode 100644
index ba2906d..0000000
--- a/main/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-main