diff --git a/cmd.go b/cmd/goose/cmd.go
similarity index 100%
rename from cmd.go
rename to cmd/goose/cmd.go
diff --git a/cmd_create.go b/cmd/goose/cmd_create.go
similarity index 100%
rename from cmd_create.go
rename to cmd/goose/cmd_create.go
diff --git a/cmd_down.go b/cmd/goose/cmd_down.go
similarity index 100%
rename from cmd_down.go
rename to cmd/goose/cmd_down.go
diff --git a/cmd_redo.go b/cmd/goose/cmd_redo.go
similarity index 100%
rename from cmd_redo.go
rename to cmd/goose/cmd_redo.go
diff --git a/cmd_status.go b/cmd/goose/cmd_status.go
similarity index 100%
rename from cmd_status.go
rename to cmd/goose/cmd_status.go
diff --git a/cmd_up.go b/cmd/goose/cmd_up.go
similarity index 100%
rename from cmd_up.go
rename to cmd/goose/cmd_up.go
diff --git a/main.go b/cmd/goose/main.go
similarity index 100%
rename from main.go
rename to cmd/goose/main.go
diff --git a/dbconf.go b/lib/goose/dbconf.go
similarity index 100%
rename from dbconf.go
rename to lib/goose/dbconf.go
diff --git a/dbconf_test.go b/lib/goose/dbconf_test.go
similarity index 100%
rename from dbconf_test.go
rename to lib/goose/dbconf_test.go
diff --git a/dialect.go b/lib/goose/dialect.go
similarity index 100%
rename from dialect.go
rename to lib/goose/dialect.go
diff --git a/migrate.go b/lib/goose/migrate.go
similarity index 100%
rename from migrate.go
rename to lib/goose/migrate.go
diff --git a/migrate_test.go b/lib/goose/migrate_test.go
similarity index 100%
rename from migrate_test.go
rename to lib/goose/migrate_test.go
diff --git a/migration_go.go b/lib/goose/migration_go.go
similarity index 100%
rename from migration_go.go
rename to lib/goose/migration_go.go
diff --git a/migration_sql.go b/lib/goose/migration_sql.go
similarity index 100%
rename from migration_sql.go
rename to lib/goose/migration_sql.go
diff --git a/migration_sql_test.go b/lib/goose/migration_sql_test.go
similarity index 100%
rename from migration_sql_test.go
rename to lib/goose/migration_sql_test.go
diff --git a/util.go b/lib/goose/util.go
similarity index 100%
rename from util.go
rename to lib/goose/util.go