diff --git a/cmd/africastalking/main.go b/cmd/africastalking/main.go
index 11c6512..cb83a3a 100644
--- a/cmd/africastalking/main.go
+++ b/cmd/africastalking/main.go
@@ -18,7 +18,7 @@ import (
 	"git.grassecon.net/urdt/ussd/config"
 	"git.grassecon.net/urdt/ussd/initializers"
 	"git.grassecon.net/urdt/ussd/internal/handlers"
-	at "git.grassecon.net/urdt/ussd/internal/http/at"
+	"git.grassecon.net/urdt/ussd/internal/http/at"
 	"git.grassecon.net/urdt/ussd/internal/storage"
 	"git.grassecon.net/urdt/ussd/remote"
 )
@@ -121,10 +121,10 @@ func main() {
 	defer stateStore.Close()
 
 	rp := &at.ATRequestParser{
-		context: ctx,
+		Context: ctx,
 	}
 	bsh := handlers.NewBaseSessionHandler(cfg, rs, stateStore, userdataStore, rp, hl)
-	sh := httpserver.NewATSessionHandler(bsh)
+	sh := at.NewATSessionHandler(bsh)
 
 	mux := http.NewServeMux()
 	mux.Handle(initializers.GetEnv("AT_ENDPOINT", "/"), sh)
diff --git a/internal/http/at/parse.go b/internal/http/at/parse.go
index a40cf0f..d2696ed 100644
--- a/internal/http/at/parse.go
+++ b/internal/http/at/parse.go
@@ -15,7 +15,7 @@ import (
 )
 
 type ATRequestParser struct {
-	context context.Context
+	Context context.Context
 }
 
 func (arp *ATRequestParser) GetSessionId(rq any) (string, error) {
@@ -43,7 +43,7 @@ func (arp *ATRequestParser) GetSessionId(rq any) (string, error) {
 		decodedStr := string(logBytes)
 		sessionId, err := extractATSessionId(decodedStr)
 		if err != nil {
-			context.WithValue(arp.context, "at-session-id", sessionId)
+			context.WithValue(arp.Context, "at-session-id", sessionId)
 		}
 		logg.Debugf("Received request:", decodedStr)
 	}