Incomplete, but I want to make sure the ideas I have here don't get wiped. Sadly this commit won't compile.

src/token.c

@@ -1,8 +1,6 @@
 #include "../includes/token.h"
 
-TokenClass GetTokenClass(TokenType);
-
-Token* CreateToken(char* lexeme, void* value, int lineNumber, TokenType type) {
+Token* CreateToken(int lineNumber, TokenClass tokenClass) {
     Token* token = calloc(1, sizeof(Token));
 
     if (!token) { 
@@ -10,36 +8,14 @@ Token* CreateToken(char* lexeme, void* value, int lineNumber, TokenType type) {
         return NULL;
     }
 
-    token->type = type;
-    token->line = lineNumber;
-    token->lexeme = lexeme;
-    token->value = value;
-    token->token_class = GetTokenClass(type);
+    token->Class = tokenClass;
+    token->LineNumber = lineNumber;
 
     return token;
 }
 
-TokenClass GetTokenClass(TokenType type) {
-    if (type >= R1 && type <= R8) return Reg;
-    if (type >= COPY && type <= OUT) return Mnemonic;
-    if (type >= DB && type <= ORG) return Directive;
-    
-    switch(type) {
-        case STRING:
-        case IDENTIFIER:
-        case LABEL:
-            return Address;
-        case NUMBER:
-            return Constant;
-        default:
-            return None;
-    }
-}
-
 void FreeToken(Token* token) {
     if (!token) return;
 
-    if (token->value && (token->type >= STRING || token->type == NUMBER)) free(token->value);
-
     free(token);
 }