diff --git a/conf/inbucket.conf b/etc/inbucket.conf
similarity index 100%
rename from conf/inbucket.conf
rename to etc/inbucket.conf
diff --git a/main/inbucketd.go b/inbucket.go
similarity index 90%
rename from main/inbucketd.go
rename to inbucket.go
index 6c980af..afffee4 100644
--- a/main/inbucketd.go
+++ b/inbucket.go
@@ -41,7 +41,7 @@ func main() {
 
 func init() {
 	flag.Usage = func() {
-		fmt.Fprintln(os.Stderr, "Usage of inbucketd [options] <conf file>:")
+		fmt.Fprintln(os.Stderr, "Usage of inbucket [options] <conf file>:")
 		flag.PrintDefaults()
 	}
 }