diff --git a/src/lib/components/common/TextInput/TextInput.stories.svelte b/src/lib/components/DataInput/TextInput.stories.svelte
similarity index 100%
rename from src/lib/components/common/TextInput/TextInput.stories.svelte
rename to src/lib/components/DataInput/TextInput.stories.svelte
diff --git a/src/lib/components/common/TextInput/TextInput.svelte b/src/lib/components/DataInput/TextInput.svelte
similarity index 100%
rename from src/lib/components/common/TextInput/TextInput.svelte
rename to src/lib/components/DataInput/TextInput.svelte
diff --git a/src/lib/components/DataInput/index.ts b/src/lib/components/DataInput/index.ts
index d6303c2..5bd68dd 100644
--- a/src/lib/components/DataInput/index.ts
+++ b/src/lib/components/DataInput/index.ts
@@ -1 +1,2 @@
-export { default as Textarea } from './Textarea.svelte';
\ No newline at end of file
+export { default as Textarea } from './Textarea.svelte';
+export { default as TextInput } from './TextInput.svelte';
\ No newline at end of file
diff --git a/src/lib/components/common/TextInput/index.ts b/src/lib/components/common/TextInput/index.ts
deleted file mode 100644
index 89470e9..0000000
--- a/src/lib/components/common/TextInput/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import TextInput from './TextInput.svelte';
-
-export default TextInput;
diff --git a/src/routes/login/+page.svelte b/src/routes/login/+page.svelte
index 182430f..a9f78fa 100644
--- a/src/routes/login/+page.svelte
+++ b/src/routes/login/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import Button from '$lib/components/common/Button';
-	import TextInput from '$lib/components/common/TextInput';
+	import { TextInput } from '$lib/components/DataInput';
 	import Tabs from '$lib/components/Navigation/Tabs';
 	import { messages } from '$lib/i18n/index.js';
 	import { fade } from 'svelte/transition';
@@ -79,4 +79,4 @@
 	.page {
 		@apply flex flex-col items-center justify-around gap-24 py-[10%];
 	}
-</style>
+</style>
\ No newline at end of file