diff --git a/.changeset/grumpy-planets-kiss.md b/.changeset/grumpy-planets-kiss.md
new file mode 100644
index 00000000..53c56192
--- /dev/null
+++ b/.changeset/grumpy-planets-kiss.md
@@ -0,0 +1,5 @@
+---
+'@svelte-put/avatar': major
+---
+
+no longer export named Avatar from root, drop `@svelte-put/avatar/hepers` submodules (just import from root instead)
diff --git a/packages/avatar/package.json b/packages/avatar/package.json
index cb35081f..54ed5af2 100644
--- a/packages/avatar/package.json
+++ b/packages/avatar/package.json
@@ -10,24 +10,15 @@
 	"exports": {
 		".": {
 			"types": "./types/index.d.ts",
-			"svelte": "./src/index.js",
 			"import": "./src/index.js"
 		},
 		"./Avatar.svelte": {
 			"types": "./src/Avatar.svelte.d.ts",
 			"svelte": "./src/Avatar.svelte"
-		},
-		"./helpers": {
-			"types": "./types/index.d.ts",
-			"svelte": "./src/avatar.helpers.js",
-			"import": "./src/avatar.helpers.js"
 		}
 	},
 	"typesVersions": {
 		"*": {
-			"helpers": [
-				"./types/index.d.ts"
-			],
 			"Avatar.svelte": [
 				"./src/Avatar.svelte.d.ts"
 			]
@@ -74,8 +65,7 @@
 	},
 	"devDependencies": {
 		"@internals/tsconfig": "workspace:*",
-		"@types/md5": "^2.3.5",
-		"dts-buddy": "^0.4.7"
+		"@types/md5": "^2.3.5"
 	},
 	"volta": {
 		"extends": "../../package.json"
diff --git a/packages/avatar/src/Avatar.svelte b/packages/avatar/src/Avatar.svelte
index 8b998d06..0886b05a 100644
--- a/packages/avatar/src/Avatar.svelte
+++ b/packages/avatar/src/Avatar.svelte
@@ -1,7 +1,7 @@
 <script>
 	import { resolveAlt, resolveSize, resolveSrc, DEFINITIVE_FALLBACK } from './avatar.utils.js';
 
-	/** @type {import('./Avatar.svelte.d.ts').AvatarProps} */
+	/** @type {import('./types').AvatarProps} */
 	let { src, gravatar, uiAvatar, fallback, size, alt, class: cls = '', img, ...rest } = $props();
 
 	let rAlt = $derived(resolveAlt(alt, gravatar, uiAvatar, src));
diff --git a/packages/avatar/src/Avatar.svelte.d.ts b/packages/avatar/src/Avatar.svelte.d.ts
index 3949a1db..db6cb9a9 100644
--- a/packages/avatar/src/Avatar.svelte.d.ts
+++ b/packages/avatar/src/Avatar.svelte.d.ts
@@ -1,106 +1,5 @@
-import type { Snippet, Component } from 'svelte';
-import type { HTMLImgAttributes } from 'svelte/elements';
+import type { Component } from 'svelte';
 
-/**
- * URL or option to fallback when email hash returns no match from Gravatar.
- * See {@link https://en.gravatar.com/site/implement/images | Gravatar } for
- * detailed explanation of each option.
- *
- */
-export type GravatarDefault =
-	| '404'
-	| 'mp'
-	| 'identicon'
-	| 'monsterid'
-	| 'wavatar'
-	| 'retro'
-	| 'robohash'
-	| 'blank'
-	| `${'http' | 'https'}://${string}.${'png' | 'jpg' | 'jpeg' | 'gif'}`;
-
-export interface GravatarOptions {
-	/** email to md5-hash */
-	email: string;
-	/** Size in pixel, from 1px up to 2048px*/
-	size?: number;
-	/** fallback image. See {@link https://en.gravatar.com/site/implement/images | Gravatar } for detailed explanation */
-	default?: GravatarDefault;
-	/** Whether to force using default image  */
-	forcedefault?: 'y';
-	/** Rating to request */
-	rating?: 'g' | 'pg' | 'r' | 'x';
-}
-
-/**
- * Options for building {@link https://ui-avatars.com | UIAvatar } url.
- * Each option should map to a supported UIAvatar setting item
- *
- */
-export interface UIAvatarOptions {
-	/** Name used to generate initials. Ex: John+Doe */
-	name: string;
-	/** Hex color for background, without the hash (#) */
-	background?: string;
-	/** Hex color for font, without the hash (#) */
-	color?: string;
-	/** Image size in pixels, between 16 and 512. Default to 64 */
-	size?: number;
-	/** Font size in percentage of size, between 0.1 and 1. Default to 0.5 */
-	'font-size'?: number;
-	/** Length of the generated initials. Default to 2 */
-	length?: number;
-	/** Whether the returnee image should be a circle. Default to false */
-	rounded?: boolean;
-	/** Whether the returned letters should use a bold font. Default to false */
-	bold?: boolean;
-	/** Whether to uppercase the initials. Default to true */
-	uppercase?: boolean;
-	/** Format of returned image */
-	format?: 'svg' | 'png';
-}
-
-/**
- * Props to Avatar component
- */
-export interface AvatarProps extends HTMLImgAttributes {
-	/**
-	 * "src" attribute. This option is of highest priority
-	 */
-	src?: string;
-	/**
-	 * Either the email for {@link https://en.gravatar.com/site/implement/images | Gravatar }
-	 * or {@link GravatarOptions } object. This option take second priority.
-	 *
-	 * By default, the Gravatar `default` query is set to 404, so that if gravatar is not valid,
-	 * the next priority url will be used. Be careful when setting this `default` to other values,
-	 * as gravatar will then always return a valid resource, hence stopping the resolution flow
-	 * (i.e uiAvatar & fallback will never be used).
-	 */
-	gravatar?: GravatarOptions | string;
-	/**
-	 * Either the name for building initials with {@link https://ui-avatars.com | UIAvatar }
-	 * or {@link UIAvatarOptions } object. This option take third priority.
-	 */
-	uiAvatar?: string | UIAvatarOptions;
-	/**
-	 * The fallback url string. This option takes lowest priority.
-	 * It defaults to the internal fallback (https://www.gravatar.com/avatar?d=mp).
-	 * If you provide a different url that is not a valid resource, the internal fallback
-	 * will be used.
-	 */
-	fallback?: string;
-	/**
-	 * value for "width" & "height" attribute of <img>.
-	 * Will have no effect if default slot is overridden
-	 */
-	size?: number;
-	/**
-	 * value for "alt" attribute of <img>.
-	 * Default to uiAvatar.name or gravatar.email if any.
-	 * Will have no effect if default slot is overridden
-	 */
-	alt?: string;
-	img?: Snippet<[{ src: string; size: number; alt: string; sources: string[] }]>;
-}
+import { AvatarProps } from './types';
 
 export declare const Avatar: Component<AvatarProps>;
diff --git a/packages/avatar/src/avatar.helpers.js b/packages/avatar/src/avatar.helpers.js
index 6c82ba6f..5e84461e 100644
--- a/packages/avatar/src/avatar.helpers.js
+++ b/packages/avatar/src/avatar.helpers.js
@@ -3,7 +3,7 @@ import md5 from 'md5';
 /**
  * Builds a {@link https://ui-avatars.com | UIAvatar } url
  *
- * @param {string | import('./LegacyAvatar.svelte.js').UIAvatarOptions} input - name for UIAvatar or object of options
+ * @param {string | import('./types').UIAvatarOptions} input - name for UIAvatar or object of options
  * @returns {string} the constructed UIAvatar URL
  */
 export function uiAvatar(input) {
@@ -25,12 +25,12 @@ export function uiAvatar(input) {
 /**
  * Builds a {@link https://en.gravatar.com/site/implement/images | Gravatar } url
  *
- * @param {string | import('./LegacyAvatar.svelte.js').GravatarOptions} input - email for Gravatar or object of options
+ * @param {string | import('./types').GravatarOptions} input - email for Gravatar or object of options
  * @returns {string} the constructed Gravatar URL
  */
 export function gravatar(input) {
 	let email = '';
-	/** @type {Omit<import('./LegacyAvatar.svelte.js').GravatarOptions, 'email'>} */
+	/** @type {Omit<import('./types').GravatarOptions, 'email'>} */
 	let options = {};
 	if (typeof input === 'string') {
 		email = input;
diff --git a/packages/avatar/src/avatar.utils.js b/packages/avatar/src/avatar.utils.js
index cf50d2ed..5cd32841 100644
--- a/packages/avatar/src/avatar.utils.js
+++ b/packages/avatar/src/avatar.utils.js
@@ -46,8 +46,8 @@ function nonNullableFilter(value) {
 /**
  * @package
  * @param {string | undefined} alt
- * @param {import('./Avatar.svelte').AvatarProps['gravatar'] | undefined} gravatar
- * @param {import('./Avatar.svelte').AvatarProps['uiAvatar'] | undefined} uiAvatar
+ * @param {import('./types').AvatarProps['gravatar'] | undefined} gravatar
+ * @param {import('./types').AvatarProps['uiAvatar'] | undefined} uiAvatar
  * @param {string | undefined } src
  * @returns {string}
  */
@@ -71,8 +71,8 @@ export function resolveAlt(
  * @param {number} fallback
  * @param {number | undefined} size
  * @param {string | undefined} src
- * @param {import('./Avatar.svelte').AvatarProps['gravatar'] | undefined} gravatar
- * @param {import('./Avatar.svelte').AvatarProps['uiAvatar'] | undefined} uiAvatar
+ * @param {import('./types').AvatarProps['gravatar'] | undefined} gravatar
+ * @param {import('./types').AvatarProps['uiAvatar'] | undefined} uiAvatar
  * @returns {number}
  */
 export function resolveSize(
@@ -98,8 +98,8 @@ export const DEFINITIVE_FALLBACK = 'https://www.gravatar.com/avatar?d=mp';
 /**
  * @package
  * @param {string | undefined} src
- * @param {import('./Avatar.svelte').AvatarProps['gravatar'] | undefined} gravatar
- * @param {import('./Avatar.svelte').AvatarProps['uiAvatar'] | undefined} uiAvatar
+ * @param {import('./types').AvatarProps['gravatar'] | undefined} gravatar
+ * @param {import('./types').AvatarProps['uiAvatar'] | undefined} uiAvatar
  * @param {string | undefined} fallback
  * @returns {string[]}
  */
diff --git a/packages/avatar/src/index.js b/packages/avatar/src/index.js
index 29f5aa22..4a233428 100644
--- a/packages/avatar/src/index.js
+++ b/packages/avatar/src/index.js
@@ -1,3 +1 @@
-// Reexport your entry components here
-export { default as Avatar } from './Avatar.svelte';
 export { gravatar, uiAvatar } from './avatar.helpers.js';
diff --git a/packages/avatar/src/types.d.ts b/packages/avatar/src/types.d.ts
new file mode 100644
index 00000000..1fe6d5ee
--- /dev/null
+++ b/packages/avatar/src/types.d.ts
@@ -0,0 +1,103 @@
+import type { Snippet } from 'svelte';
+import type { HTMLImgAttributes } from 'svelte/elements';
+/**
+ * URL or option to fallback when email hash returns no match from Gravatar.
+ * See {@link https://en.gravatar.com/site/implement/images | Gravatar } for
+ * detailed explanation of each option.
+ *
+ */
+export type GravatarDefault =
+	| '404'
+	| 'mp'
+	| 'identicon'
+	| 'monsterid'
+	| 'wavatar'
+	| 'retro'
+	| 'robohash'
+	| 'blank'
+	| `${'http' | 'https'}://${string}.${'png' | 'jpg' | 'jpeg' | 'gif'}`;
+
+export interface GravatarOptions {
+	/** email to md5-hash */
+	email: string;
+	/** Size in pixel, from 1px up to 2048px*/
+	size?: number;
+	/** fallback image. See {@link https://en.gravatar.com/site/implement/images | Gravatar } for detailed explanation */
+	default?: GravatarDefault;
+	/** Whether to force using default image  */
+	forcedefault?: 'y';
+	/** Rating to request */
+	rating?: 'g' | 'pg' | 'r' | 'x';
+}
+
+/**
+ * Options for building {@link https://ui-avatars.com | UIAvatar } url.
+ * Each option should map to a supported UIAvatar setting item
+ *
+ */
+export interface UIAvatarOptions {
+	/** Name used to generate initials. Ex: John+Doe */
+	name: string;
+	/** Hex color for background, without the hash (#) */
+	background?: string;
+	/** Hex color for font, without the hash (#) */
+	color?: string;
+	/** Image size in pixels, between 16 and 512. Default to 64 */
+	size?: number;
+	/** Font size in percentage of size, between 0.1 and 1. Default to 0.5 */
+	'font-size'?: number;
+	/** Length of the generated initials. Default to 2 */
+	length?: number;
+	/** Whether the returnee image should be a circle. Default to false */
+	rounded?: boolean;
+	/** Whether the returned letters should use a bold font. Default to false */
+	bold?: boolean;
+	/** Whether to uppercase the initials. Default to true */
+	uppercase?: boolean;
+	/** Format of returned image */
+	format?: 'svg' | 'png';
+}
+
+/**
+ * Props to Avatar component
+ */
+export interface AvatarProps extends HTMLImgAttributes {
+	/**
+	 * "src" attribute. This option is of highest priority
+	 */
+	src?: string;
+	/**
+	 * Either the email for {@link https://en.gravatar.com/site/implement/images | Gravatar }
+	 * or {@link GravatarOptions } object. This option take second priority.
+	 *
+	 * By default, the Gravatar `default` query is set to 404, so that if gravatar is not valid,
+	 * the next priority url will be used. Be careful when setting this `default` to other values,
+	 * as gravatar will then always return a valid resource, hence stopping the resolution flow
+	 * (i.e uiAvatar & fallback will never be used).
+	 */
+	gravatar?: GravatarOptions | string;
+	/**
+	 * Either the name for building initials with {@link https://ui-avatars.com | UIAvatar }
+	 * or {@link UIAvatarOptions } object. This option take third priority.
+	 */
+	uiAvatar?: string | UIAvatarOptions;
+	/**
+	 * The fallback url string. This option takes lowest priority.
+	 * It defaults to the internal fallback (https://www.gravatar.com/avatar?d=mp).
+	 * If you provide a different url that is not a valid resource, the internal fallback
+	 * will be used.
+	 */
+	fallback?: string;
+	/**
+	 * value for "width" & "height" attribute of <img>.
+	 * Will have no effect if default slot is overridden
+	 */
+	size?: number;
+	/**
+	 * value for "alt" attribute of <img>.
+	 * Default to uiAvatar.name or gravatar.email if any.
+	 * Will have no effect if default slot is overridden
+	 */
+	alt?: string;
+	img?: Snippet<[{ src: string; size: number; alt: string; sources: string[] }]>;
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 862c5355..c7289050 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -110,9 +110,6 @@ importers:
       '@types/md5':
         specifier: ^2.3.5
         version: 2.3.5
-      dts-buddy:
-        specifier: ^0.4.7
-        version: 0.4.7(typescript@5.4.5)
 
   packages/clickoutside:
     dependencies: