1 files changed, 13 insertions, 9 deletions

diff --git a/pkg/discord/discord.go b/pkg/discord/discord.go
index a75e8e7..0030971 100644
--- a/pkg/discord/discord.go
+++ b/pkg/discord/discord.go
@@ -2,6 +2,10 @@ package discord
 
 import (
 	"context"
+	"jinx/pkg/discord/entities"
+	"jinx/pkg/discord/events"
+	"jinx/pkg/discord/gateway"
+	"jinx/pkg/discord/rest"
 
 	"github.com/rs/zerolog"
 )
@@ -9,17 +13,17 @@ import (
 type Discord struct {
 	token        string
 	logger       *zerolog.Logger
-	gateway      Gateway
-	eventHandler EventHandler
-	rest         REST
+	gateway      gateway.Gateway
+	eventHandler events.EventHandler
+	rest         rest.REST
 }
 
 func NewClient(token string, logger *zerolog.Logger) *Discord {
 	token = "Bot " + token
 
-	eventHandler := NewEventHandler()
-	rest := NewREST(token)
-	gateway := NewGateway(logger, eventHandler)
+	eventHandler := events.NewEventHandler()
+	rest := rest.New(token)
+	gateway := gateway.New(logger, eventHandler)
 
 	return &Discord{
 		token:        token,
@@ -42,7 +46,7 @@ func (d *Discord) Connect(ctx context.Context) error {
 	}
 
 	// We are ready!
-	d.eventHandler.Fire(DISCORD_EVENT_READY, nil)
+	d.eventHandler.Fire(events.READY, nil)
 
 	return nil
 }
@@ -51,10 +55,10 @@ func (d *Discord) Disconnect() error {
 	return d.gateway.Close()
 }
 
-func (d *Discord) SendMessage(channelID Snowflake, content string) error {
+func (d *Discord) SendMessage(channelID entities.Snowflake, content string) error {
 	return d.rest.SendMessage(channelID, content)
 }
 
-func (d *Discord) On(eventName DiscordEvent, handler func(payload any)) {
+func (d *Discord) On(eventName events.Event, handler func(payload any)) {
 	d.eventHandler.Add(eventName, handler)
 }