diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index b943dbc..0000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "deno.enable": true
-}
\ No newline at end of file
diff --git a/app.js b/app.js
index 8de5ed9..c14ac69 100644
--- a/app.js
+++ b/app.js
@@ -1,3 +1 @@
-import {van, vanX} from "./van.js";
-
-van.state
\ No newline at end of file
+/** @type {Van.State<number>} */
\ No newline at end of file
diff --git a/faux.d.ts b/faux.d.ts
deleted file mode 100644
index ec94706..0000000
--- a/faux.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export declare type Member =(s:string)=>Array<boolean>;
-export declare const Member:Member;
\ No newline at end of file
diff --git a/faux.js b/faux.js
deleted file mode 100644
index e69de29..0000000
diff --git a/van.d.ts b/van.d.ts
index 4664907..f16a02d 100644
--- a/van.d.ts
+++ b/van.d.ts
@@ -1,18 +1,69 @@
+export {}
+declare global
+{
+  namespace VanX
+  {
+      type StateOf<T> = { readonly [K in keyof T]: Van.State<T[K]> }
+      type ValueType<T> = T extends (infer V)[] ? V : T[keyof T]
+      type KeyType<T> = T extends unknown[] ? number : string
+      type ReplacementFunc<T> =
+          T extends (infer V)[] ? (items: V[]) => readonly V[] :
+          (items: [string, T[keyof T]][]) => readonly [string, T[keyof T]][]
+  }
 
-export const van:{
-  readonly state: <T>(initVal: T)=> Van.State<T>
-  readonly derive: <T>(f: () => T) => Van.State<T>
-  readonly add: (dom: Element, ...children: readonly Van.ChildDom[]) => Element
-  readonly tags: Van.Tags & ((namespaceURI: string) => Readonly<Record<string, Van.TagFunc<Element>>>)
-  readonly hydrate: <T extends Node>(dom: T, f: (dom: T) => T | null | undefined) => T
-}
-export const vanX: {
-  readonly calc: <R>(f: () => R) => R
-  readonly reactive: <T extends object>(obj: T) => T
-  readonly noreactive: <T extends object>(obj: T) => T
-  readonly stateFields: <T extends object>(obj: T) => VanX.StateOf<T>
-  readonly raw: <T extends object>(obj: T) => T
-  readonly list: <T extends object, ElementType extends Element>(container: (() => ElementType) | ElementType, items: T,itemFunc: (v: Van.State<VanX.ValueType<T>>, deleter: () => void, k: VanX.KeyType<T>) => Node) => ElementType
-  readonly replace: <T extends object>(obj: T, replacement: VanX.ReplacementFunc<T> | T) => T
-  readonly compact: <T extends object>(obj: T) => T
-}
+  namespace Van {
+
+      interface State<T> {
+        val: T
+        readonly oldVal: T
+        readonly rawVal: T
+      }
+      
+      // Defining readonly view of State<T> for covariance.
+      // Basically we want StateView<string> to implement StateView<string | number>
+      type StateView<T> = Readonly<State<T>>
+      
+      type Val<T> = State<T> | T
+      
+      type Primitive = string | number | boolean | bigint
+      
+      // deno-lint-ignore no-explicit-any
+      type PropValue = Primitive | ((e: any) => void) | null
+      
+      type PropValueOrDerived = PropValue | StateView<PropValue> | (() => PropValue)
+      
+      type Props = Record<string, PropValueOrDerived> & { class?: PropValueOrDerived; is?: string }
+      
+      type PropsWithKnownKeys<ElementType> = Partial<{[K in keyof ElementType]: PropValueOrDerived}>
+      
+      type ValidChildDomValue = Primitive | Node | null | undefined
+      
+      type BindingFunc = ((dom?: Node) => ValidChildDomValue) | ((dom?: Element) => Element)
+      
+      type ChildDom = ValidChildDomValue | StateView<Primitive | null | undefined> | BindingFunc | readonly ChildDom[]
+      
+      type TagFunc<Result> = (first?: Props & PropsWithKnownKeys<Result> | ChildDom, ...rest: readonly ChildDom[]) => Result
+      
+      type Tags = Readonly<Record<string, TagFunc<Element>>> & {
+        [K in keyof HTMLElementTagNameMap]: TagFunc<HTMLElementTagNameMap[K]>
+      }
+  }
+
+  const van:{
+    readonly state: <T>(initVal: T)=> Van.State<T>
+    readonly derive: <T>(f: () => T) => Van.State<T>
+    readonly add: (dom: Element, ...children: readonly Van.ChildDom[]) => Element
+    readonly tags: Van.Tags & ((namespaceURI: string) => Readonly<Record<string, Van.TagFunc<Element>>>)
+    readonly hydrate: <T extends Node>(dom: T, f: (dom: T) => T | null | undefined) => T
+  };
+  const vanX: {
+    readonly calc: <R>(f: () => R) => R
+    readonly reactive: <T extends object>(obj: T) => T
+    readonly noreactive: <T extends object>(obj: T) => T
+    readonly stateFields: <T extends object>(obj: T) => VanX.StateOf<T>
+    readonly raw: <T extends object>(obj: T) => T
+    readonly list: <T extends object, ElementType extends Element>(container: (() => ElementType) | ElementType, items: T,itemFunc: (v: Van.State<VanX.ValueType<T>>, deleter: () => void, k: VanX.KeyType<T>) => Node) => ElementType
+    readonly replace: <T extends object>(obj: T, replacement: VanX.ReplacementFunc<T> | T) => T
+    readonly compact: <T extends object>(obj: T) => T
+  };
+}
\ No newline at end of file
diff --git a/van.globals.d.ts.old b/van.globals.d.ts.old
deleted file mode 100644
index e993a16..0000000
--- a/van.globals.d.ts.old
+++ /dev/null
@@ -1,10 +0,0 @@
-export {}
-declare global {
-  const van:{
-    readonly state: <T>(initVal: T)=> Van.State<T>
-    readonly derive: <T>(f: () => T) => Van.State<T>
-    readonly add: (dom: Element, ...children: readonly Van.ChildDom[]) => Element
-    readonly tags: Van.Tags & ((namespaceURI: string) => Readonly<Record<string, Van.TagFunc<Element>>>)
-    readonly hydrate: <T extends Node>(dom: T, f: (dom: T) => T | null | undefined) => T
-  }
-}
diff --git a/van.js b/van.js
deleted file mode 100644
index 8dcbaa3..0000000
--- a/van.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export const van = globalThis.van;
-export const vanX = globalThis.vanX;
\ No newline at end of file
diff --git a/van.types.d.ts b/van.types.d.ts
deleted file mode 100644
index 5b3a385..0000000
--- a/van.types.d.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-
-declare namespace Van {
-
-    interface State<T> {
-      val: T
-      readonly oldVal: T
-      readonly rawVal: T
-    }
-    
-    // Defining readonly view of State<T> for covariance.
-    // Basically we want StateView<string> to implement StateView<string | number>
-    type StateView<T> = Readonly<State<T>>
-    
-    type Val<T> = State<T> | T
-    
-    type Primitive = string | number | boolean | bigint
-    
-    // deno-lint-ignore no-explicit-any
-    type PropValue = Primitive | ((e: any) => void) | null
-    
-    type PropValueOrDerived = PropValue | StateView<PropValue> | (() => PropValue)
-    
-    type Props = Record<string, PropValueOrDerived> & { class?: PropValueOrDerived; is?: string }
-    
-    type PropsWithKnownKeys<ElementType> = Partial<{[K in keyof ElementType]: PropValueOrDerived}>
-    
-    type ValidChildDomValue = Primitive | Node | null | undefined
-    
-    type BindingFunc = ((dom?: Node) => ValidChildDomValue) | ((dom?: Element) => Element)
-    
-    type ChildDom = ValidChildDomValue | StateView<Primitive | null | undefined> | BindingFunc | readonly ChildDom[]
-    
-    type TagFunc<Result> = (first?: Props & PropsWithKnownKeys<Result> | ChildDom, ...rest: readonly ChildDom[]) => Result
-    
-    type Tags = Readonly<Record<string, TagFunc<Element>>> & {
-      [K in keyof HTMLElementTagNameMap]: TagFunc<HTMLElementTagNameMap[K]>
-    }
-}
-declare namespace VanX
-{
-    type StateOf<T> = { readonly [K in keyof T]: Van.State<T[K]> }
-    type ValueType<T> = T extends (infer V)[] ? V : T[keyof T]
-    type KeyType<T> = T extends unknown[] ? number : string
-    type ReplacementFunc<T> =
-        T extends (infer V)[] ? (items: V[]) => readonly V[] :
-        (items: [string, T[keyof T]][]) => readonly [string, T[keyof T]][]
-}
\ No newline at end of file
diff --git a/van.types.d.ts.old b/van.types.d.ts.old
deleted file mode 100644
index 0c83f68..0000000
--- a/van.types.d.ts.old
+++ /dev/null
@@ -1,39 +0,0 @@
-
-declare namespace Van {
-
-    interface State<T> {
-      val: T
-      readonly oldVal: T
-      readonly rawVal: T
-    }
-    
-    // Defining readonly view of State<T> for covariance.
-    // Basically we want StateView<string> to implement StateView<string | number>
-    type StateView<T> = Readonly<State<T>>
-    
-    type Val<T> = State<T> | T
-    
-    type Primitive = string | number | boolean | bigint
-    
-    // deno-lint-ignore no-explicit-any
-    type PropValue = Primitive | ((e: any) => void) | null
-    
-    type PropValueOrDerived = PropValue | StateView<PropValue> | (() => PropValue)
-    
-    type Props = Record<string, PropValueOrDerived> & { class?: PropValueOrDerived; is?: string }
-    
-    type PropsWithKnownKeys<ElementType> = Partial<{[K in keyof ElementType]: PropValueOrDerived}>
-    
-    type ValidChildDomValue = Primitive | Node | null | undefined
-    
-    type BindingFunc = ((dom?: Node) => ValidChildDomValue) | ((dom?: Element) => Element)
-    
-    type ChildDom = ValidChildDomValue | StateView<Primitive | null | undefined> | BindingFunc | readonly ChildDom[]
-    
-    type TagFunc<Result> = (first?: Props & PropsWithKnownKeys<Result> | ChildDom, ...rest: readonly ChildDom[]) => Result
-    
-    type Tags = Readonly<Record<string, TagFunc<Element>>> & {
-      [K in keyof HTMLElementTagNameMap]: TagFunc<HTMLElementTagNameMap[K]>
-    }
-    
-}
\ No newline at end of file
diff --git a/van.x.globals.d.ts.old b/van.x.globals.d.ts.old
deleted file mode 100644
index 81de377..0000000
--- a/van.x.globals.d.ts.old
+++ /dev/null
@@ -1,13 +0,0 @@
-export {};
-declare global {
-    const vanX: {
-        readonly calc: <R>(f: () => R) => R
-        readonly reactive: <T extends object>(obj: T) => T
-        readonly noreactive: <T extends object>(obj: T) => T
-        readonly stateFields: <T extends object>(obj: T) => VanX.StateOf<T>
-        readonly raw: <T extends object>(obj: T) => T
-        readonly list: <T extends object, ElementType extends Element>(container: (() => ElementType) | ElementType, items: T,itemFunc: (v: Van.State<VanX.ValueType<T>>, deleter: () => void, k: VanX.KeyType<T>) => Node) => ElementType
-        readonly replace: <T extends object>(obj: T, replacement: VanX.ReplacementFunc<T> | T) => T
-        readonly compact: <T extends object>(obj: T) => T
-    }
-}
\ No newline at end of file
diff --git a/van.x.types.d.ts.old b/van.x.types.d.ts.old
deleted file mode 100644
index 1337f96..0000000
--- a/van.x.types.d.ts.old
+++ /dev/null
@@ -1,9 +0,0 @@
-declare namespace VanX
-{
-    type StateOf<T> = { readonly [K in keyof T]: Van.State<T[K]> }
-    type ValueType<T> = T extends (infer V)[] ? V : T[keyof T]
-    type KeyType<T> = T extends unknown[] ? number : string
-    type ReplacementFunc<T> =
-        T extends (infer V)[] ? (items: V[]) => readonly V[] :
-        (items: [string, T[keyof T]][]) => readonly [string, T[keyof T]][]
-}
\ No newline at end of file