@@ -2,7 +2,11 @@ DROP TABLE IF EXISTS users CASCADE;
 
 --gopg:split
 
-DROP TABLE IF EXISTS twitch_tokens CASCADE;
+DROP TABLE IF EXISTS twitch_accounts CASCADE;
+
+--gopg:split
+
+DROP TABLE IF EXISTS mc_accounts CASCADE;
 
 --gopg:split
 
 
@@ -4,28 +4,35 @@ CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
 
 CREATE TABLE IF NOT EXISTS users (
   id uuid PRIMARY KEY DEFAULT uuid_generate_v4(),
-  email varchar(255) NOT NULL,
-  email_verified boolean NOT NULL,
-  twitch_id varchar(255) NOT NULL,
-  twitch_username varchar(25) NOT NULL,
-  twitch_picture text,
-  mc_username varchar(16),
-  mc_uuid uuid,
   last_login_at timestamptz NOT NULL DEFAULT now(),
   created_at timestamptz NOT NULL DEFAULT now(),
   updated_at timestamptz NOT NULL DEFAULT now(),
   deleted_at timestamptz
 );
 
-CREATE UNIQUE INDEX IF NOT EXISTS twitch_id_idx ON users (twitch_id);
-
 --gopg:split
 
-CREATE TABLE IF NOT EXISTS twitch_tokens (
-  id uuid PRIMARY KEY DEFAULT uuid_generate_v4(),
-  user_id uuid NOT NULL REFERENCES users (id) ON DELETE CASCADE,
+CREATE TABLE IF NOT EXISTS twitch_accounts (
+  id text PRIMARY KEY,
+  email text NOT NULL,
+  email_verified boolean NOT NULL,
+  username varchar(25) NOT NULL,
+  picture text,
   access_token varchar(255) NOT NULL,
   refresh_token varchar(255) NOT NULL,
+  user_id uuid NOT NULL REFERENCES users (id) ON DELETE CASCADE,
+  created_at timestamptz NOT NULL DEFAULT now(),
+  updated_at timestamptz NOT NULL DEFAULT now(),
+  deleted_at timestamptz
+);
+
+--gopg:split
+
+CREATE TABLE IF NOT EXISTS mc_accounts (
+  id uuid PRIMARY KEY,
+  username varchar(16) NOT NULL,
+  skin text,
+  user_id uuid NOT NULL REFERENCES users (id) ON DELETE CASCADE,
   created_at timestamptz NOT NULL DEFAULT now(),
   updated_at timestamptz NOT NULL DEFAULT now(),
   deleted_at timestamptz
@@ -36,9 +43,9 @@ CREATE TABLE IF NOT EXISTS twitch_tokens (
 CREATE TABLE IF NOT EXISTS games (
   id uuid PRIMARY KEY DEFAULT uuid_generate_v4(),
   user_id uuid NOT NULL REFERENCES users (id) ON DELETE CASCADE,
-  name varchar(255) NOT NULL,
-  motd varchar(255) NOT NULL,
-  slots int DEFAULT 10,
+  name varchar(60) NOT NULL,
+  motd varchar(59),
+  slots int DEFAULT 10 NOT NULL,
   address varchar(63) NOT NULL,
   edition varchar(25) NOT NULL,
   state varchar(25) NOT NULL,