diff --git a/web_server/database/app.db b/web_server/database/app.db
index 80e83e6..a6fa279 100644
Binary files a/web_server/database/app.db and b/web_server/database/app.db differ
diff --git a/web_server/database/schema.sql b/web_server/database/schema.sql
deleted file mode 100644
index 869ccdc..0000000
--- a/web_server/database/schema.sql
+++ /dev/null
@@ -1,105 +0,0 @@
--- View all tables in the database
-SELECT name FROM sqlite_master WHERE type='table';
-
-DROP TABLE IF EXISTS users;
-CREATE TABLE users
-(
-    user_id INTEGER PRIMARY KEY AUTOINCREMENT,
-    username VARCHAR(50) NOT NULL,
-    password VARCHAR(256) NOT NULL,
-    email VARCHAR(64) NOT NULL,
-    num_followers INTEGER NOT NULL,
-    isPartenered BOOLEAN NOT NULL DEFAULT 0,
-    bio TEXT
-);
-
-SELECT * FROM users;
-
-
-DROP TABLE IF EXISTS streams;
-CREATE TABLE streams
-(
-    stream_id INTEGER PRIMARY KEY AUTOINCREMENT,
-    title TEXT NOT NULL,
-    start_time DATETIME NOT NULL,
-    num_viewers INTEGER NOT NULL DEFAULT 0,
-    isLive BOOLEAN NOT NULL DEFAULT 0,
-    vod_id INTEGER,
-    streamer_id INTEGER NOT NULL,
-    FOREIGN KEY (streamer_id) REFERENCES streamers(user_id) ON DELETE CASCADE
-);
-
-DROP TABLE IF EXISTS streamers;
-CREATE TABLE streamers
-(
-    user_id INTEGER PRIMARY KEY NOT NULL,
-    streamer_id INTEGER NOT NULL,
-    FOREIGN KEY(user_id) REFERENCES users(user_id) ON DELETE CASCADE
-);
-
-
-DROP TABLE IF EXISTS follows;
-CREATE TABLE follows
-(
-    user_id INTEGER NOT NULL,
-    streamer_id INTEGER NOT NULL,
-    since DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    PRIMARY KEY (user_id, streamer_id),
-    FOREIGN KEY (user_id) REFERENCES users(user_id) ON DELETE CASCADE,
-    FOREIGN KEY (streamer_id) REFERENCES streamers(streamer_id) ON DELETE CASCADE
-);
-
-DROP TABLE IF EXISTS chat;
-CREATE TABLE chat
-(
-    message_id INTEGER PRIMARY KEY AUTOINCREMENT,
-    stream_id INTEGER NOT NULL,
-    chatter_id VARCHAR(50) NOT NULL,
-    message VARCHAR(256) NOT NULL,
-    time_sent DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    PRIMARY KEY (message_id, stream_id),
-    FOREIGN KEY (chatter_id) REFERENCES users(user_id),
-    FOREIGN KEY (stream_id) REFERENCES streams(stream_id) ON DELETE CASCADE
-);
-
-CREATE INDEX chatter_index ON chat(chatter_id);
-
-DROP TABLE IF EXISTS categories;
-CREATE TABLE categories
-(
-    category_id INTEGER PRIMARY KEY AUTOINCREMENT,
-    category_name VARCHAR(25) NOT NULL
-);
-
-DROP TABLE IF EXISTS stream_categories;
-CREATE TABLE stream_categories
-(
-    stream_id INTEGER NOT NULL,
-    category_id INTEGER NOT NULL,
-    FOREIGN KEY (stream_id) REFERENCES streams(stream_id),
-    FOREIGN KEY (category_id) REFERENCES categories(category_id) ON DELETE CASCADE
-);
-
-DROP TABLE IF EXISTS user_preferences;
-CREATE TABLE user_preferences
-(
-    user_id INT NOT NULL,
-    category_id INT NOT NULL,
-    favourability INT NOT NULL DEFAULT 0,
-    PRIMARY KEY(user_id, category_id),
-    FOREIGN KEY(user_id) REFERENCES users(user_id) ON DELETE CASCADE,
-    FOREIGN KEY(category_id) REFERENCES categories(category_id) ON DELETE CASCADE
-);
-
-DROP TABLE IF EXISTS subscribes;
-CREATE TABLE subscribes
-(
-    user_id INTEGER NOT NULL,
-    streamer_id INTEGER NOT NULL,
-    since DATETIME NOT NULL,
-    expires DATETIME NOT NULL,
-    PRIMARY KEY (user_id,streamer_id),
-    FOREIGN KEY(user_id) REFERENCES users(user_id) ON DELETE CASCADE,
-    FOREIGN KEY(streamer_id) REFERENCES streamers(streamer_id) ON DELETE CASCADE   
-);
-
diff --git a/web_server/database/streaming.sql b/web_server/database/streaming.sql
new file mode 100644
index 0000000..5a51dba
--- /dev/null
+++ b/web_server/database/streaming.sql
@@ -0,0 +1,63 @@
+DROP TABLE IF EXISTS tags;
+CREATE TABLE tags
+(
+    tag_id INTEGER PRIMARY KEY AUTOINCREMENT,
+    tag_name VARCHAR(25)
+);
+
+DROP TABLE IF EXISTS stream_tags;
+CREATE TABLE stream_tags
+(
+    stream_id INTEGER NOT NULL,
+    tag_id INTEGER NOT NULL,
+    FOREIGN KEY (stream_id) REFERENCES streams(stream_id),
+    FOREIGN KEY (tag_id) REFERENCES tags(tag_id) ON DELETE CASCADE
+);
+
+DROP TABLE IF EXISTS chat;
+CREATE TABLE chat
+(
+    message_id INTEGER PRIMARY KEY AUTOINCREMENT,
+    stream_id INTEGER NOT NULL,
+    chatter_id VARCHAR(50) NOT NULL,
+    message VARCHAR(256) NOT NULL,
+    time_sent DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    PRIMARY KEY (message_id, stream_id),
+    FOREIGN KEY (chatter_id) REFERENCES users(user_id),
+    FOREIGN KEY (stream_id) REFERENCES streams(stream_id) ON DELETE CASCADE
+);
+
+CREATE INDEX chatter_index ON chat(chatter_id);
+
+DROP TABLE IF EXISTS categories;
+CREATE TABLE categories
+(
+    category_id INTEGER PRIMARY KEY AUTOINCREMENT,
+    category_name VARCHAR(25) NOT NULL
+);
+
+DROP TABLE IF EXISTS streams;
+CREATE TABLE streams
+(
+    streamer_id INTEGER NOT NULL,
+    stream_id INTEGER NOT NULL,
+    title TEXT NOT NULL,
+    start_time DATETIME NOT NULL,
+    num_viewers INTEGER NOT NULL DEFAULT 0,
+    isLive BOOLEAN NOT NULL DEFAULT 0,
+    vod_id INTEGER,
+    category_id NOT NULL,
+    PRIMARY KEY (streamer_id, stream_id),
+    FOREIGN KEY (category_id) REFERENCES categories(category_id) ON DELETE CASCADE,
+    FOREIGN KEY (streamer_id) REFERENCES streamers(user_id) ON DELETE CASCADE
+);
+
+DROP TABLE IF EXISTS streamers;
+CREATE TABLE streamers
+(
+    user_id INTEGER PRIMARY KEY NOT NULL,
+    streamer_id INTEGER NOT NULL,
+    since DATETIME,
+    isPartnered BOOLEAN NOT NULL DEFAULT 0,
+    FOREIGN KEY(user_id) REFERENCES users(user_id) ON DELETE CASCADE
+);
diff --git a/web_server/database/users.sql b/web_server/database/users.sql
new file mode 100644
index 0000000..764de41
--- /dev/null
+++ b/web_server/database/users.sql
@@ -0,0 +1,50 @@
+-- View all tables in the database
+SELECT name FROM sqlite_master WHERE type='table';
+
+DROP TABLE IF EXISTS users;
+CREATE TABLE users
+(
+    user_id INTEGER PRIMARY KEY AUTOINCREMENT,
+    username VARCHAR(50) NOT NULL,
+    password VARCHAR(256) NOT NULL,
+    email VARCHAR(64) NOT NULL,
+    num_followers INTEGER NOT NULL,
+    bio TEXT
+);
+
+SELECT * FROM users;
+
+DROP TABLE IF EXISTS follows;
+CREATE TABLE follows
+(
+    user_id INTEGER NOT NULL,
+    streamer_id INTEGER NOT NULL,   
+    since DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    PRIMARY KEY (user_id, streamer_id),
+    FOREIGN KEY (user_id) REFERENCES users(user_id) ON DELETE CASCADE,
+    FOREIGN KEY (streamer_id) REFERENCES streamers(streamer_id) ON DELETE CASCADE
+);
+
+DROP TABLE IF EXISTS user_preferences;
+CREATE TABLE user_preferences
+(
+    user_id INT NOT NULL,
+    category_id INT NOT NULL,
+    favourability INT NOT NULL DEFAULT 0,
+    PRIMARY KEY(user_id, category_id),
+    FOREIGN KEY(user_id) REFERENCES users(user_id) ON DELETE CASCADE,
+    FOREIGN KEY(category_id) REFERENCES categories(category_id) ON DELETE CASCADE
+);
+
+DROP TABLE IF EXISTS subscribes;
+CREATE TABLE subscribes
+(
+    user_id INTEGER NOT NULL,
+    streamer_id INTEGER NOT NULL,
+    since DATETIME NOT NULL,
+    expires DATETIME NOT NULL,
+    PRIMARY KEY (user_id,streamer_id),
+    FOREIGN KEY(user_id) REFERENCES users(user_id) ON DELETE CASCADE,
+    FOREIGN KEY(streamer_id) REFERENCES streamers(streamer_id) ON DELETE CASCADE   
+);
+