diff --git a/.golangci.yml b/.golangci.yml
index 7d3a47ddb..ca7e9f787 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -22,6 +22,6 @@ linters-settings:
   gofmt:
     simplify: true
   goimports:
-    local-prefixes: github.com/quickfixgo/quickfix
+    local-prefixes: github.com/clear-street/quickfix
   dupl:
     threshold: 400
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 2e0799d43..0d5c7c528 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ clean:
 	rm -rf gen
 
 generate: clean
-	mkdir -p gen; cd gen; go run ../cmd/generate-fix/generate-fix.go -pkg-root=github.com/quickfixgo/quickfix/gen ../spec/*.xml
+	mkdir -p gen; cd gen; go run ../cmd/generate-fix/generate-fix.go -pkg-root=github.com/clear-street/quickfix/gen ../spec/*.xml
 
 fmt:
 	gofmt -l -w -s $(shell find . -type f -name '*.go')
@@ -65,6 +65,6 @@ test-ci:
 	go test -v -cover . ./datadictionary ./internal
 
 generate-ci: clean
-	mkdir -p gen; cd gen; go run ../cmd/generate-fix/generate-fix.go -pkg-root=github.com/quickfixgo/quickfix/gen ../spec/$(shell echo $(FIX_TEST) | tr  '[:lower:]' '[:upper:]').xml; 
+	mkdir -p gen; cd gen; go run ../cmd/generate-fix/generate-fix.go -pkg-root=github.com/clear-street/quickfix/gen ../spec/$(shell echo $(FIX_TEST) | tr  '[:lower:]' '[:upper:]').xml;
 
 # ---------------------------------------------------------------
diff --git a/README.md b/README.md
index 350c7f6c9..446a1ec3f 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # QuickFIX/Go
 
-[![Build Status](https://github.com/quickfixgo/quickfix/workflows/CI/badge.svg)](https://github.com/quickfixgo/quickfix/actions) [![GoDoc](https://godoc.org/github.com/quickfixgo/quickfix?status.png)](https://godoc.org/github.com/quickfixgo/quickfix) [![Go Report Card](https://goreportcard.com/badge/github.com/quickfixgo/quickfix)](https://goreportcard.com/report/github.com/quickfixgo/quickfix)
+[![Build Status](https://github.com/clear-street/quickfix/workflows/CI/badge.svg)](https://github.com/clear-street/quickfix/actions) [![GoDoc](https://godoc.org/github.com/clear-street/quickfix?status.png)](https://godoc.org/github.com/clear-street/quickfix) [![Go Report Card](https://goreportcard.com/badge/github.com/clear-street/quickfix)](https://goreportcard.com/report/github.com/clear-street/quickfix)
 
 Open Source [FIX Protocol](http://www.fixprotocol.org/) library implemented in Go
 
@@ -8,7 +8,7 @@ Open Source [FIX Protocol](http://www.fixprotocol.org/) library implemented in G
 <p>QuickFIX/Go is a <a href="https://www.fixtrading.org/">FIX Protocol Community</a> implementation for the <a href="https://golang.org">Go programming language</a>.</p> 
 
 <ul>
-  <li>100% free and open source with a liberal <a href="https://github.com/quickfixgo/quickfix/blob/master/LICENSE.txt">license</a></li>
+  <li>100% free and open source with a liberal <a href="https://github.com/clear-street/quickfix/blob/master/LICENSE.txt">license</a></li>
   <li>Supports FIX versions 4.0 - 5.0SP2</li>
   <li>Runs on any hardware and operating system supported by Go (1.18+ required)</li>
   <li>Spec driven run-time message validation</li>
@@ -31,7 +31,7 @@ Open Source [FIX Protocol](http://www.fixprotocol.org/) library implemented in G
 With [Go module](https://github.com/golang/go/wiki/Modules) support, simply add the following import
 
 ```
-import "github.com/quickfixgo/quickfix"
+import "github.com/clear-street/quickfix"
 ```
 
 to your code, and then `go [build|run|test]` will automatically fetch the necessary dependencies.
@@ -39,13 +39,13 @@ to your code, and then `go [build|run|test]` will automatically fetch the necess
 Otherwise, run the following Go command to install the `quickfix` package:
 
 ```sh
-go get -u github.com/quickfixgo/quickfix
+go get -u github.com/clear-street/quickfix
 ```
 
 ## Getting Started
 
 * [QuickFIX User Manual](http://quickfixgo.org/docs)
-* [Go API Documentation](https://godoc.org/github.com/quickfixgo/quickfix)
+* [Go API Documentation](https://godoc.org/github.com/clear-street/quickfix)
 * See [examples](https://github.com/quickfixgo/examples) for some simple examples of using QuickFIX/Go.
 
 ## FIX Messaging Model
@@ -73,7 +73,7 @@ Following installation, `generate-fix` is installed to `$GOPATH/bin/generate-fix
 ## General Support
 <h3>Github Discussions</h3>
 
-<p>Our <a href="https://github.com/quickfixgo/quickfix/discussions/categories/q-a">Github Discussions Board</a> is free, public, and easily searchable. It’s the preferred method of user support from the QuickFIX/Go team.
+<p>Our <a href="https://github.com/clear-street/quickfix/discussions/categories/q-a">Github Discussions Board</a> is free, public, and easily searchable. It’s the preferred method of user support from the QuickFIX/Go team.
 
 <p>Please provide as much detail as you can when asking a question, and include relevant configurations and code snippets.</p>
 
@@ -87,7 +87,7 @@ Following installation, `generate-fix` is installed to `$GOPATH/bin/generate-fix
 
 <p><strong>Note:</strong> Please do not submit questions or help requests to the issues list. It is for bugs and issues. If you need help, please use the Discussions board as described above and you’ll be able to send your question to the entire community.</p>
 
-<p><a href="https://github.com/quickfixgo/quickfix/issues">GitHub Issues</a></p>
+<p><a href="https://github.com/clear-street/quickfix/issues">GitHub Issues</a></p>
 
 <p>Please provide sample code, logs, and a description of the problem when the issue is submitted.</p>
 
@@ -149,4 +149,4 @@ make accept
 
 ## Licensing
 
-This software is available under the QuickFIX Software License. Please see the [LICENSE.txt](https://github.com/quickfixgo/quickfix/blob/main/LICENSE.txt) for the terms specified by the QuickFIX Software License.
+This software is available under the QuickFIX Software License. Please see the [LICENSE.txt](https://github.com/clear-street/quickfix/blob/main/LICENSE.txt) for the terms specified by the QuickFIX Software License.
diff --git a/_test/test-server/main.go b/_test/test-server/main.go
index b70dca258..09382094d 100644
--- a/_test/test-server/main.go
+++ b/_test/test-server/main.go
@@ -8,9 +8,9 @@ import (
 	"os"
 	"os/signal"
 
-	"github.com/quickfixgo/quickfix"
-	field "github.com/quickfixgo/quickfix/gen/field"
-	tag "github.com/quickfixgo/quickfix/gen/tag"
+	"github.com/clear-street/quickfix"
+	field "github.com/clear-street/quickfix/gen/field"
+	tag "github.com/clear-street/quickfix/gen/tag"
 )
 
 var router *quickfix.MessageRouter = quickfix.NewMessageRouter()
diff --git a/accepter_test.go b/accepter_test.go
index 5e032cbb1..151967132 100644
--- a/accepter_test.go
+++ b/accepter_test.go
@@ -4,7 +4,7 @@ import (
 	"net"
 	"testing"
 
-	"github.com/quickfixgo/quickfix/config"
+	"github.com/clear-street/quickfix/config"
 
 	proxyproto "github.com/armon/go-proxyproto"
 	"github.com/stretchr/testify/assert"
diff --git a/acceptor.go b/acceptor.go
index 3d72ba20e..1c456b89f 100644
--- a/acceptor.go
+++ b/acceptor.go
@@ -12,7 +12,7 @@ import (
 
 	proxyproto "github.com/armon/go-proxyproto"
 
-	"github.com/quickfixgo/quickfix/config"
+	"github.com/clear-street/quickfix/config"
 )
 
 // Acceptor accepts connections from FIX clients and manages the associated sessions.
diff --git a/cmd/generate-fix/generate-fix.go b/cmd/generate-fix/generate-fix.go
index ae1749722..db14fd871 100644
--- a/cmd/generate-fix/generate-fix.go
+++ b/cmd/generate-fix/generate-fix.go
@@ -12,8 +12,8 @@ import (
 	"sync"
 	"text/template"
 
-	"github.com/quickfixgo/quickfix/cmd/generate-fix/internal"
-	"github.com/quickfixgo/quickfix/datadictionary"
+	"github.com/clear-street/quickfix/cmd/generate-fix/internal"
+	"github.com/clear-street/quickfix/datadictionary"
 )
 
 var (
diff --git a/cmd/generate-fix/internal/globals.go b/cmd/generate-fix/internal/globals.go
index 45e49467d..1c2a772cd 100644
--- a/cmd/generate-fix/internal/globals.go
+++ b/cmd/generate-fix/internal/globals.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"sort"
 
-	"github.com/quickfixgo/quickfix/datadictionary"
+	"github.com/clear-street/quickfix/datadictionary"
 )
 
 type fieldTypeMap map[string]*datadictionary.FieldType
@@ -14,7 +14,7 @@ var (
 	GlobalFieldTypes       []*datadictionary.FieldType
 )
 
-//sort fieldtypes by name
+// sort fieldtypes by name
 type byFieldName []*datadictionary.FieldType
 
 func (n byFieldName) Len() int           { return len(n) }
diff --git a/cmd/generate-fix/internal/template_helpers.go b/cmd/generate-fix/internal/template_helpers.go
index e4dcce727..b9c922efa 100644
--- a/cmd/generate-fix/internal/template_helpers.go
+++ b/cmd/generate-fix/internal/template_helpers.go
@@ -3,7 +3,7 @@ package internal
 import (
 	"fmt"
 
-	"github.com/quickfixgo/quickfix/datadictionary"
+	"github.com/clear-street/quickfix/datadictionary"
 )
 
 func checkIfDecimalImportRequiredForFields(fTypes []*datadictionary.FieldType) (ok bool, err error) {
diff --git a/cmd/generate-fix/internal/templates.go b/cmd/generate-fix/internal/templates.go
index 72fb24b2c..747f0f0ca 100644
--- a/cmd/generate-fix/internal/templates.go
+++ b/cmd/generate-fix/internal/templates.go
@@ -167,7 +167,7 @@ import(
 	{{- end }}
 
 
-	"github.com/quickfixgo/quickfix"
+	"github.com/clear-street/quickfix"
 	{{- if checkIfEnumImportRequired .MessageDef}}
 	"{{ importRootPath }}/enum"
 	{{- end }}
@@ -202,7 +202,7 @@ import(
 	"{{ . }}"
 	{{- end }}
 
-	"github.com/quickfixgo/quickfix"
+	"github.com/clear-street/quickfix"
 	{{- if checkIfEnumImportRequired .MessageDef}}
 	"{{ importRootPath }}/enum"
 	{{- end }}
@@ -230,7 +230,7 @@ import(
 	"{{ . }}"
 	{{- end }}
 
-	"github.com/quickfixgo/quickfix"
+	"github.com/clear-street/quickfix"
 	{{- if checkIfEnumImportRequired .MessageDef}}
 	"{{ importRootPath }}/enum"
 	{{- end }}
@@ -297,7 +297,7 @@ func Route(router RouteOut) (string, string, quickfix.MessageRoute) {
 
 	TagTemplate = template.Must(template.New("Tag").Parse(`
 package tag
-import("github.com/quickfixgo/quickfix")
+import("github.com/clear-street/quickfix")
 
 const (
 {{- range .}}
@@ -309,7 +309,7 @@ const (
 	FieldTemplate = template.Must(template.New("Field").Funcs(tmplFuncs).Parse(`
 package field
 import(
-	"github.com/quickfixgo/quickfix"
+	"github.com/clear-street/quickfix"
 	"{{ importRootPath }}/enum"
 	"{{ importRootPath }}/tag"
 {{ if checkIfDecimalImportRequiredForFields . }} "github.com/shopspring/decimal" {{ end }}
diff --git a/datadictionary/component_type_test.go b/datadictionary/component_type_test.go
index c9774764b..364eb0b99 100644
--- a/datadictionary/component_type_test.go
+++ b/datadictionary/component_type_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/quickfixgo/quickfix/datadictionary"
+	"github.com/clear-street/quickfix/datadictionary"
 )
 
 func TestNewComponentType(t *testing.T) {
diff --git a/datadictionary/field_def_test.go b/datadictionary/field_def_test.go
index cb80fa131..04b9c43db 100644
--- a/datadictionary/field_def_test.go
+++ b/datadictionary/field_def_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/quickfixgo/quickfix/datadictionary"
+	"github.com/clear-street/quickfix/datadictionary"
 )
 
 func TestNewFieldDef(t *testing.T) {
diff --git a/datadictionary/field_type_test.go b/datadictionary/field_type_test.go
index 00c651eef..710ea593d 100644
--- a/datadictionary/field_type_test.go
+++ b/datadictionary/field_type_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/quickfixgo/quickfix/datadictionary"
+	"github.com/clear-street/quickfix/datadictionary"
 )
 
 func TestNewFieldType(t *testing.T) {
diff --git a/datadictionary/group_field_def_test.go b/datadictionary/group_field_def_test.go
index 87147ce55..44f324c1c 100644
--- a/datadictionary/group_field_def_test.go
+++ b/datadictionary/group_field_def_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/quickfixgo/quickfix/datadictionary"
+	"github.com/clear-street/quickfix/datadictionary"
 )
 
 func TestNewGroupField(t *testing.T) {
diff --git a/datadictionary/message_def_test.go b/datadictionary/message_def_test.go
index 73de16452..ffa9d14ac 100644
--- a/datadictionary/message_def_test.go
+++ b/datadictionary/message_def_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/quickfixgo/quickfix/datadictionary"
+	"github.com/clear-street/quickfix/datadictionary"
 )
 
 func TestNewMessageDef(t *testing.T) {
diff --git a/dialer.go b/dialer.go
index 1eb28ad04..399543621 100644
--- a/dialer.go
+++ b/dialer.go
@@ -6,7 +6,7 @@ import (
 
 	"golang.org/x/net/proxy"
 
-	"github.com/quickfixgo/quickfix/config"
+	"github.com/clear-street/quickfix/config"
 )
 
 func loadDialerConfig(settings *SessionSettings) (dialer proxy.Dialer, err error) {
diff --git a/dialer_test.go b/dialer_test.go
index 47bf79d08..0511ac92e 100644
--- a/dialer_test.go
+++ b/dialer_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	"github.com/quickfixgo/quickfix/config"
+	"github.com/clear-street/quickfix/config"
 )
 
 type DialerTestSuite struct {
diff --git a/file_log.go b/file_log.go
index 52146f07e..fd43ee7f9 100644
--- a/file_log.go
+++ b/file_log.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"path"
 
-	"github.com/quickfixgo/quickfix/config"
+	"github.com/clear-street/quickfix/config"
 )
 
 type fileLog struct {
diff --git a/filestore.go b/filestore.go
index 3b93db6e2..3914e531b 100644
--- a/filestore.go
+++ b/filestore.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/quickfixgo/quickfix/config"
+	"github.com/clear-street/quickfix/config"
 )
 
 type msgDef struct {
diff --git a/fix_utc_timestamp_test.go b/fix_utc_timestamp_test.go
index b29039587..a1084429e 100644
--- a/fix_utc_timestamp_test.go
+++ b/fix_utc_timestamp_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/quickfixgo/quickfix"
+	"github.com/clear-street/quickfix"
 )
 
 func TestFIXUTCTimestampWrite(t *testing.T) {
diff --git a/go.mod b/go.mod
index 952abfa45..abf938c96 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/quickfixgo/quickfix
+module github.com/clear-street/quickfix
 
 go 1.18
 
diff --git a/in_session.go b/in_session.go
index 3ca45d7bd..761c445b3 100644
--- a/in_session.go
+++ b/in_session.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"time"
 
-	"github.com/quickfixgo/quickfix/internal"
+	"github.com/clear-street/quickfix/internal"
 )
 
 type inSession struct{ loggedOn }
diff --git a/in_session_test.go b/in_session_test.go
index 80e827dec..4cfc0ba9f 100644
--- a/in_session_test.go
+++ b/in_session_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	"github.com/quickfixgo/quickfix/internal"
+	"github.com/clear-street/quickfix/internal"
 )
 
 type InSessionTestSuite struct {
diff --git a/latent_state.go b/latent_state.go
index e6e5bece4..5f52b9a0d 100644
--- a/latent_state.go
+++ b/latent_state.go
@@ -1,6 +1,6 @@
 package quickfix
 
-import "github.com/quickfixgo/quickfix/internal"
+import "github.com/clear-street/quickfix/internal"
 
 type latentState struct{ inSessionTime }
 
diff --git a/logon_state.go b/logon_state.go
index d254b92b3..e07a53556 100644
--- a/logon_state.go
+++ b/logon_state.go
@@ -3,7 +3,7 @@ package quickfix
 import (
 	"bytes"
 
-	"github.com/quickfixgo/quickfix/internal"
+	"github.com/clear-street/quickfix/internal"
 )
 
 type logonState struct{ connectedNotLoggedOn }
diff --git a/logon_state_test.go b/logon_state_test.go
index cea45618b..7164e697d 100644
--- a/logon_state_test.go
+++ b/logon_state_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	"github.com/quickfixgo/quickfix/internal"
+	"github.com/clear-street/quickfix/internal"
 )
 
 type LogonStateTestSuite struct {
diff --git a/logout_state.go b/logout_state.go
index 071512ce1..173d4c242 100644
--- a/logout_state.go
+++ b/logout_state.go
@@ -1,6 +1,6 @@
 package quickfix
 
-import "github.com/quickfixgo/quickfix/internal"
+import "github.com/clear-street/quickfix/internal"
 
 type logoutState struct{ connectedNotLoggedOn }
 
diff --git a/logout_state_test.go b/logout_state_test.go
index 5b074f329..be1859092 100644
--- a/logout_state_test.go
+++ b/logout_state_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	"github.com/quickfixgo/quickfix/internal"
+	"github.com/clear-street/quickfix/internal"
 )
 
 type LogoutStateTestSuite struct {
diff --git a/message.go b/message.go
index 0a637346b..4b2d228f7 100644
--- a/message.go
+++ b/message.go
@@ -6,7 +6,7 @@ import (
 	"math"
 	"time"
 
-	"github.com/quickfixgo/quickfix/datadictionary"
+	"github.com/clear-street/quickfix/datadictionary"
 )
 
 // Header is first section of a FIX Message
diff --git a/message_test.go b/message_test.go
index 40b063ca1..f0b646038 100644
--- a/message_test.go
+++ b/message_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	"github.com/quickfixgo/quickfix/datadictionary"
+	"github.com/clear-street/quickfix/datadictionary"
 )
 
 func BenchmarkParseMessage(b *testing.B) {
diff --git a/mongostore.go b/mongostore.go
index 1bd32db7f..2230adfb4 100644
--- a/mongostore.go
+++ b/mongostore.go
@@ -10,7 +10,7 @@ import (
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
 
-	"github.com/quickfixgo/quickfix/config"
+	"github.com/clear-street/quickfix/config"
 )
 
 type mongoStoreFactory struct {
diff --git a/not_session_time.go b/not_session_time.go
index 2e3b04c3d..8639ca0f6 100644
--- a/not_session_time.go
+++ b/not_session_time.go
@@ -1,6 +1,6 @@
 package quickfix
 
-import "github.com/quickfixgo/quickfix/internal"
+import "github.com/clear-street/quickfix/internal"
 
 type notSessionTime struct{ latentState }
 
diff --git a/pending_timeout.go b/pending_timeout.go
index 87154dddd..f33ee16ab 100644
--- a/pending_timeout.go
+++ b/pending_timeout.go
@@ -1,6 +1,6 @@
 package quickfix
 
-import "github.com/quickfixgo/quickfix/internal"
+import "github.com/clear-street/quickfix/internal"
 
 type pendingTimeout struct {
 	sessionState
diff --git a/pending_timeout_test.go b/pending_timeout_test.go
index 1ad845d89..414a3fe1e 100644
--- a/pending_timeout_test.go
+++ b/pending_timeout_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	"github.com/quickfixgo/quickfix/internal"
+	"github.com/clear-street/quickfix/internal"
 )
 
 type PendingTimeoutTestSuite struct {
diff --git a/quickfix_test.go b/quickfix_test.go
index 575a28614..5bc18dd4c 100644
--- a/quickfix_test.go
+++ b/quickfix_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/quickfixgo/quickfix/internal"
+	"github.com/clear-street/quickfix/internal"
 )
 
 type QuickFIXSuite struct {
diff --git a/resend_state.go b/resend_state.go
index d07559b82..bf33af87a 100644
--- a/resend_state.go
+++ b/resend_state.go
@@ -1,6 +1,6 @@
 package quickfix
 
-import "github.com/quickfixgo/quickfix/internal"
+import "github.com/clear-street/quickfix/internal"
 
 type resendState struct {
 	loggedOn
diff --git a/resend_state_test.go b/resend_state_test.go
index 4d8184a9d..cbda833c8 100644
--- a/resend_state_test.go
+++ b/resend_state_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	"github.com/quickfixgo/quickfix/internal"
+	"github.com/clear-street/quickfix/internal"
 )
 
 type resendStateTestSuite struct {
diff --git a/session.go b/session.go
index f539d285a..e3980ce13 100644
--- a/session.go
+++ b/session.go
@@ -7,8 +7,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/quickfixgo/quickfix/datadictionary"
-	"github.com/quickfixgo/quickfix/internal"
+	"github.com/clear-street/quickfix/datadictionary"
+	"github.com/clear-street/quickfix/internal"
 )
 
 // The Session is the primary FIX abstraction for message communication
diff --git a/session_factory.go b/session_factory.go
index 769e5084a..25ce59896 100644
--- a/session_factory.go
+++ b/session_factory.go
@@ -7,9 +7,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/quickfixgo/quickfix/config"
-	"github.com/quickfixgo/quickfix/datadictionary"
-	"github.com/quickfixgo/quickfix/internal"
+	"github.com/clear-street/quickfix/config"
+	"github.com/clear-street/quickfix/datadictionary"
+	"github.com/clear-street/quickfix/internal"
 )
 
 var dayLookup = map[string]time.Weekday{
diff --git a/session_factory_test.go b/session_factory_test.go
index a86cfe369..5fedd564e 100644
--- a/session_factory_test.go
+++ b/session_factory_test.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	"github.com/quickfixgo/quickfix/config"
-	"github.com/quickfixgo/quickfix/internal"
+	"github.com/clear-street/quickfix/config"
+	"github.com/clear-street/quickfix/internal"
 )
 
 type SessionFactorySuite struct {
diff --git a/session_settings_test.go b/session_settings_test.go
index 34687ae2c..ea0c4e66b 100644
--- a/session_settings_test.go
+++ b/session_settings_test.go
@@ -3,7 +3,7 @@ package quickfix
 import (
 	"testing"
 
-	"github.com/quickfixgo/quickfix/config"
+	"github.com/clear-street/quickfix/config"
 )
 
 func TestSessionSettings_StringSettings(t *testing.T) {
diff --git a/session_state.go b/session_state.go
index 016cb3e8c..0a9ea7b90 100644
--- a/session_state.go
+++ b/session_state.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/quickfixgo/quickfix/internal"
+	"github.com/clear-street/quickfix/internal"
 )
 
 type stateMachine struct {
diff --git a/session_test.go b/session_test.go
index 293b94805..e60b40548 100644
--- a/session_test.go
+++ b/session_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/quickfixgo/quickfix/internal"
+	"github.com/clear-street/quickfix/internal"
 
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
diff --git a/settings.go b/settings.go
index f70bf9596..e1578aa7f 100644
--- a/settings.go
+++ b/settings.go
@@ -7,7 +7,7 @@ import (
 	"io"
 	"regexp"
 
-	"github.com/quickfixgo/quickfix/config"
+	"github.com/clear-street/quickfix/config"
 )
 
 // The Settings type represents a collection of global and session settings.
diff --git a/settings_test.go b/settings_test.go
index 9ce568e50..102c9ec81 100644
--- a/settings_test.go
+++ b/settings_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/quickfixgo/quickfix/config"
+	"github.com/clear-street/quickfix/config"
 )
 
 func TestSettings_New(t *testing.T) {
diff --git a/sqlstore.go b/sqlstore.go
index d0b1c5162..074a1a417 100644
--- a/sqlstore.go
+++ b/sqlstore.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/quickfixgo/quickfix/config"
+	"github.com/clear-street/quickfix/config"
 )
 
 type sqlStoreFactory struct {
diff --git a/tls.go b/tls.go
index 62c7207f3..3227ee484 100644
--- a/tls.go
+++ b/tls.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"github.com/quickfixgo/quickfix/config"
+	"github.com/clear-street/quickfix/config"
 )
 
 func loadTLSConfig(settings *SessionSettings) (tlsConfig *tls.Config, err error) {
diff --git a/tls_test.go b/tls_test.go
index 9274b95dd..2040aea17 100644
--- a/tls_test.go
+++ b/tls_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	"github.com/quickfixgo/quickfix/config"
+	"github.com/clear-street/quickfix/config"
 )
 
 type TLSTestSuite struct {
diff --git a/validation.go b/validation.go
index 14f6f9f0d..3ed23faf9 100644
--- a/validation.go
+++ b/validation.go
@@ -1,7 +1,7 @@
 package quickfix
 
 import (
-	"github.com/quickfixgo/quickfix/datadictionary"
+	"github.com/clear-street/quickfix/datadictionary"
 )
 
 // Validator validates a FIX message
diff --git a/validation_test.go b/validation_test.go
index 25a47802a..087ebf4d8 100644
--- a/validation_test.go
+++ b/validation_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/quickfixgo/quickfix/datadictionary"
+	"github.com/clear-street/quickfix/datadictionary"
 )
 
 type validateTest struct {