diff --git a/packages/datalib/src/index.ts b/packages/datalib/src/index.ts
index 347769a5..30daf5c3 100644
--- a/packages/datalib/src/index.ts
+++ b/packages/datalib/src/index.ts
@@ -6,12 +6,8 @@ export * from './TableGridDisplay';
 export * from './ViewGridDisplay';
 export * from './JslGridDisplay';
 export * from './ChangeSet';
-export * from './FreeTableGridDisplay';
-export * from './FreeTableModel';
 export * from './MacroDefinition';
 export * from './runMacro';
-// export * from './FormViewDisplay';
-// export * from './TableFormViewDisplay';
 export * from './CollectionGridDisplay';
 export * from './deleteCascade';
 export * from './PerspectiveDisplay';
diff --git a/packages/web/src/datagrid/DataGrid.svelte b/packages/web/src/datagrid/DataGrid.svelte
index 8195d766..1d6c05e2 100644
--- a/packages/web/src/datagrid/DataGrid.svelte
+++ b/packages/web/src/datagrid/DataGrid.svelte
@@ -57,8 +57,8 @@
   import HorizontalSplitter from '../elements/HorizontalSplitter.svelte';
   import VerticalSplitter from '../elements/VerticalSplitter.svelte';
   import FormViewFilters from '../formview/FormViewFilters.svelte';
-  import MacroDetail from '../freetable/MacroDetail.svelte';
-  import MacroManager from '../freetable/MacroManager.svelte';
+  import MacroDetail from '../macro/MacroDetail.svelte';
+  import MacroManager from '../macro/MacroManager.svelte';
   import WidgetColumnBar from '../widgets/WidgetColumnBar.svelte';
   import WidgetColumnBarItem from '../widgets/WidgetColumnBarItem.svelte';
   import ColumnManager from './ColumnManager.svelte';
diff --git a/packages/web/src/freetable/ColumnManagerRow.svelte b/packages/web/src/freetable/ColumnManagerRow.svelte
deleted file mode 100644
index c255bd58..00000000
--- a/packages/web/src/freetable/ColumnManagerRow.svelte
+++ /dev/null
@@ -1,50 +0,0 @@
-<script lang="ts">
-  import FontIcon from '../icons/FontIcon.svelte';
-
-  export let column;
-  export let onEdit;
-  export let onRemove;
-  export let onUp;
-  export let onDown;
-</script>
-
-<div class="row">
-  <div class="name">{column.columnName}</div>
-  <div class="nowrap">
-    <span class="icon" on:click={onEdit}>
-      <FontIcon icon="icon edit" />
-    </span>
-    <span class="icon" on:click={onRemove}>
-      <FontIcon icon="icon delete" />
-    </span>
-    <span class="icon" on:click={onUp}>
-      <FontIcon icon="icon arrow-up" />
-    </span>
-    <span class="icon" on:click={onDown}>
-      <FontIcon icon="icon arrow-down" />
-    </span>
-  </div>
-</div>
-
-<style>
-  .row {
-    display: flex;
-    justify-content: space-between;
-    cursor: pointer;
-  }
-  .row:hover {
-    background-color: var(--theme-bg-selected);
-  }
-  .name {
-    white-space: nowrap;
-    margin: 5px;
-  }
-  .icon {
-    position: relative;
-    top: 5px;
-    padding: 5px;
-  }
-  .icon:hover {
-    background-color: var(--theme-bg-3);
-  }
-</style>
diff --git a/packages/web/src/freetable/ColumnNameEditor.svelte b/packages/web/src/freetable/ColumnNameEditor.svelte
deleted file mode 100644
index 0cb5975f..00000000
--- a/packages/web/src/freetable/ColumnNameEditor.svelte
+++ /dev/null
@@ -1,55 +0,0 @@
-<script lang="ts">
-  import { onMount } from 'svelte';
-  import keycodes from '../utility/keycodes';
-
-  export let onEnter;
-  export let onBlur = undefined;
-  export let focusOnCreate = false;
-  export let blurOnEnter = false;
-  export let existingNames;
-  export let defaultValue = '';
-
-  let domEditor;
-  let value = defaultValue || '';
-  $: isError = value && existingNames && existingNames.includes(value);
-
-  const handleKeyDown = event => {
-    if (value && event.keyCode == keycodes.enter && !isError) {
-      onEnter(value);
-      value = '';
-      if (blurOnEnter) domEditor.blur();
-    }
-    if (event.keyCode == keycodes.escape) {
-      value = '';
-      domEditor.blur();
-    }
-  };
-  const handleBlur = () => {
-    if (value && !isError) {
-      onEnter(value);
-      value = '';
-    }
-    if (onBlur) onBlur();
-  };
-  if (focusOnCreate) onMount(() => domEditor.focus());
-</script>
-
-<input
-  type="text"
-  {...$$restProps}
-  bind:value
-  bind:this={domEditor}
-  on:keydown={handleKeyDown}
-  on:blur={handleBlur}
-  class:isError
-/>
-
-<style>
-  input {
-    width: calc(100% - 10px);
-  }
-
-  input.isError {
-    background: var(--theme-bg-red);
-  }
-</style>
diff --git a/packages/web/src/freetable/MacroDetail.svelte b/packages/web/src/macro/MacroDetail.svelte
similarity index 100%
rename from packages/web/src/freetable/MacroDetail.svelte
rename to packages/web/src/macro/MacroDetail.svelte
diff --git a/packages/web/src/freetable/MacroHeader.svelte b/packages/web/src/macro/MacroHeader.svelte
similarity index 100%
rename from packages/web/src/freetable/MacroHeader.svelte
rename to packages/web/src/macro/MacroHeader.svelte
diff --git a/packages/web/src/freetable/MacroInfoTab.svelte b/packages/web/src/macro/MacroInfoTab.svelte
similarity index 100%
rename from packages/web/src/freetable/MacroInfoTab.svelte
rename to packages/web/src/macro/MacroInfoTab.svelte
diff --git a/packages/web/src/freetable/MacroManager.svelte b/packages/web/src/macro/MacroManager.svelte
similarity index 100%
rename from packages/web/src/freetable/MacroManager.svelte
rename to packages/web/src/macro/MacroManager.svelte
diff --git a/packages/web/src/freetable/MacroParameters.svelte b/packages/web/src/macro/MacroParameters.svelte
similarity index 100%
rename from packages/web/src/freetable/MacroParameters.svelte
rename to packages/web/src/macro/MacroParameters.svelte
diff --git a/packages/web/src/freetable/MacroPreviewGrider.ts b/packages/web/src/macro/MacroPreviewGrider.ts
similarity index 100%
rename from packages/web/src/freetable/MacroPreviewGrider.ts
rename to packages/web/src/macro/MacroPreviewGrider.ts
diff --git a/packages/web/src/freetable/macros.js b/packages/web/src/macro/macros.js
similarity index 100%
rename from packages/web/src/freetable/macros.js
rename to packages/web/src/macro/macros.js