diff --git a/lib/views/index.html b/lib/WetSock/Client/Assets/index.html
similarity index 62%
rename from lib/views/index.html
rename to lib/WetSock/Client/Assets/index.html
index e1f379e..0dd20f3 100644
--- a/lib/views/index.html
+++ b/lib/WetSock/Client/Assets/index.html
@@ -4,8 +4,12 @@
   <title>WetSock Client Test</title>
   <style>
     /* Add some basic styling */
+    * {
+      box-sizing: border-box;
+    }
     body {
       font-family: Arial, sans-serif;
+      font-size: 16px;
       margin: 20px;
     }
     input, button {
@@ -16,6 +20,8 @@
       padding: 10px;
       height: 300px;
       overflow-y: scroll;
+      letter-spacing: 0.125em;
+      font-size: 1rem;
     }
   </style>
 </head>
@@ -49,11 +55,19 @@
   <button id="sendButton">Send</button>
 
   <h2>Output:</h2>
-  <div id="output"></div>
+  <pre id="output"></pre>
 
   <script type="module">
     import WetSockClient from './client.js';
-    const client = new WetSockClient('wss://wetsock.ghosted.id:443/chat');
+
+    const url = new URL(window.location.href);
+    const wetsockAddr = [
+      url.protocol.startsWith('https') ? 'wss' : 'ws',
+      '://',
+      url.host,
+      '/chat'
+    ].join('');
+    const client = new WetSockClient(wetsockAddr);
     const pluginIdentifierSelect = document.getElementById('pluginIdentifier');
     const actionNameSelect = document.getElementById('actionName');
     const entityIdInput = document.getElementById('entityId');
@@ -61,19 +75,23 @@
     const sendButton = document.getElementById('sendButton');
     const outputDiv = document.getElementById('output');
 
+    client.on('message', (message) => {
+      log(message);
+    });
+
     client.on('connected', () => {
       log('Connected to WetSock server');
     });
 
-    client.on('pluginList', (data) => {
-      updatePluginOptions(data.plugins);
+    client.on('plugins', (plugins) => {
+      updatePluginOptions(plugins);
     });
 
-    client.on('actionPerformed', (data) => {
+    client.on('done', (data) => {
       log(`Action performed: ${JSON.stringify(data)}`);
     });
 
-    client.on('entityCreated', (data) => {
+    client.on('created', (data) => {
       log(`Entity created: ${JSON.stringify(data)}`);
     });
 
@@ -83,20 +101,30 @@
       const entityId = entityIdInput.value;
       const args = argsInput.value.split(',').map(arg => arg.trim());
 
-      if (actionName === 'create') {
-        client.createEntity(pluginIdentifier, { /* entity data */ });
-      } else {
-        client.performAction(pluginIdentifier, entityId, actionName, ...args);
-      }
+      client.send(JSON.stringify({
+        action: [
+          actionName ? `/${actionName}` : null,
+          entityId ?? null
+        ].filter(v => !!v).join('.'),
+        message: String(args.length > 0 ? args.join(' ') : pluginIdentifier),
+      }));
     });
 
+    function addOptionElement(el, config = { value: '', identifier: 'select...' }) {
+      const opt = document.createElement('option');
+      opt.setAttribute('value', config.value);
+      opt.textContent = config.identifier;
+      el.appendChild(opt);
+    }
+
     function updatePluginOptions(plugins) {
       pluginIdentifierSelect.innerHTML = '';
+      addOptionElement(pluginIdentifierSelect);
       plugins.forEach((plugin) => {
-        const option = document.createElement('option');
-        option.value = plugin.identifier;
-        option.textContent = plugin.identifier;
-        pluginIdentifierSelect.appendChild(option);
+        addOptionElement(pluginIdentifierSelect, {
+          value: plugin.identifier,
+          identifier: plugin.identifier
+        });
       });
       updateActionOptions();
     }
@@ -105,17 +133,19 @@
       const pluginIdentifier = pluginIdentifierSelect.value;
       const actions = client.plugins.get(pluginIdentifier);
       actionNameSelect.innerHTML = '';
+      addOptionElement(actionNameSelect);
+      if(!pluginIdentifier) return;
       actions.forEach((action) => {
-        const option = document.createElement('option');
-        option.value = action;
-        option.textContent = action;
-        actionNameSelect.appendChild(option);
+        addOptionElement(actionNameSelect, {
+          value: action,
+          identifier: action
+        });
       });
     }
 
     function log(message) {
       const entry = document.createElement('div');
-      entry.textContent = message;
+      entry.textContent = typeof(message) == 'string' ? message : JSON.stringify(message);
       outputDiv.appendChild(entry);
       outputDiv.scrollTop = outputDiv.scrollHeight;
     }
diff --git a/lib/WetSock/Models/Repository.js b/lib/WetSock/Models/Repository.js
deleted file mode 100644
index 3f512c8..0000000
--- a/lib/WetSock/Models/Repository.js
+++ /dev/null
@@ -1,24 +0,0 @@
-export default class Repository {
-  #entityClass = undefined;
-  #actions = new Map();
-  constructor(config) {
-    this.#entityClass = config.entityClass;
-  }
-
-  create(entityData) {
-    return new this.#entityClass(entityData);
-  }
-
-  perform(entity, actionName, ...args) {
-    if(!this.#actions.has(actionName)) throw new Error(`Action '${actionName}' is not registered.`);
-    return this.#actions.get(actionName)(entity, ...args);
-  }
-
-  register(actionName, actionFn) {
-    this.#actions.set(actionName, actionFn);
-  }
-
-  getActions() {
-    return Array.from(this.#actions.keys());
-  }
-}
diff --git a/lib/WetSock/Models/Room.js b/lib/WetSock/Models/Room.js
deleted file mode 100644
index 233c9fe..0000000
--- a/lib/WetSock/Models/Room.js
+++ /dev/null
@@ -1,19 +0,0 @@
-export default class Room {
-  constructor(data) {
-    this.id = data.id;
-    this.name = data.name;
-    this.users = new Set();
-  }
-
-  addUser(userId) {
-    this.users.add(userId);
-  }
-
-  removeUser(userId) {
-    this.users.delete(userId);
-  }
-
-  getUsers() {
-    return Array.from(this.users);
-  }
-}
diff --git a/lib/WetSock/Plugins/EntityPlugin.js b/lib/WetSock/Plugins/EntityPlugin.js
deleted file mode 100644
index 9b0f096..0000000
--- a/lib/WetSock/Plugins/EntityPlugin.js
+++ /dev/null
@@ -1,65 +0,0 @@
-import BasePlugin from './BasePlugin';
-
-class EntityPlugin extends BasePlugin {
-  #config = {};
-  #entities = new Map();
-  #repository = null;
-
-  constructor(config) {
-    super();
-    this.#config = config;
-  }
-
-  initialize(wetsock) {
-    super.initialize(wetsock);
-
-    this.#repository = this.#config.repository;
-    this.#config.entities.forEach((data) => {
-      const entity = this.#repository.create(data);
-      this.#entities.set(entity.id, entity);
-    });
-  }
-
-  onMessage(clientId, message) {
-    const { action, entityId, data } = message;
-
-    if (action === 'create') {
-      const entity = this.#repository.create(data);
-      this.#entities.set(entity.id, entity);
-      this.broadcast(clientId, { event: 'entityCreated', entityId: entity.id });
-    } else if (action === 'perform') {
-      const entity = this.#entities.get(entityId);
-      if (entity) {
-        const result = this.#repository.perform(entity, data.actionName, ...data.args);
-        this.broadcast(clientId, { event: 'actionPerformed', entityId, actionName: data.actionName, result });
-      }
-    }
-  }
-
-  onOpen(clientId) {
-    // Send the list of available entities to the client
-    const entityList = Array.from(this.#entities.values());
-    this.send(clientId, { event: 'entityList', entities: entityList });
-  }
-
-  onClose(clientId) {
-    // Handle client disconnection if needed
-  }
-
-  broadcast(clientId, message) {
-    // Broadcast the message to all connected clients
-    for (const [id, client] of this._getServer().clients) {
-      if (id !== clientId) {
-        client.send(JSON.stringify(message));
-      }
-    }
-  }
-
-  send(clientId, message) {
-    // Send the message to a specific client
-    const client = this._getServer().clients.get(clientId);
-    if (client) {
-      client.send(JSON.stringify(message));
-    }
-  }
-}