diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/validation/context/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/validation/context/index.ts
index 96fbced51a..99311cb3cf 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/validation/context/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/validation/context/index.ts
@@ -1,4 +1,2 @@
 export * from './validation.context.js';
 export * from './validation.context-token.js';
-export * from './server-model-validation.context.js';
-export * from './server-model-validation.context-token.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/validation/controllers/bind-server-validation-to-form-control.controller.ts b/src/Umbraco.Web.UI.Client/src/packages/core/validation/controllers/bind-server-validation-to-form-control.controller.ts
index f0abe49189..5d1b81293e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/validation/controllers/bind-server-validation-to-form-control.controller.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/validation/controllers/bind-server-validation-to-form-control.controller.ts
@@ -30,7 +30,6 @@ export class UmbBindServerValidationToFormControl extends UmbControllerBase {
 			// If not valid lets see if we should remove server validation [NL]
 			if (!jsonStringComparison(this.#value, value)) {
 				this.#value = value;
-				console.log('remove messages');
 				// Only remove server validations from validation context [NL]
 				this.#messages.forEach((message) => {
 					if (message.type === 'server') {
@@ -51,7 +50,6 @@ export class UmbBindServerValidationToFormControl extends UmbControllerBase {
 				context.messages.messagesOfTypeAndPath('server', dataPath),
 				(messages) => {
 					this.#messages = messages;
-					console.log('messages', messages);
 					this.#isValid = messages.length === 0;
 					if (!this.#isValid) {
 						this.#setup();
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/validation/controllers/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/validation/controllers/index.ts
index 35003793f3..e28cfdeb9c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/validation/controllers/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/validation/controllers/index.ts
@@ -1,3 +1,5 @@
 export * from './bind-server-validation-to-form-control.controller.js';
-export * from './observe-validation-state.controller.js';
 export * from './form-control-validator.controller.js';
+export * from './observe-validation-state.controller.js';
+export * from './server-model-validation.context-token.js';
+export * from './server-model-validation.context.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/validation/context/server-model-validation.context-token.ts b/src/Umbraco.Web.UI.Client/src/packages/core/validation/controllers/server-model-validation.context-token.ts
similarity index 69%
rename from src/Umbraco.Web.UI.Client/src/packages/core/validation/context/server-model-validation.context-token.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/validation/controllers/server-model-validation.context-token.ts
index 1f8a1932dc..a37d4b48c4 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/validation/context/server-model-validation.context-token.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/validation/controllers/server-model-validation.context-token.ts
@@ -1,4 +1,4 @@
-import type { UmbServerModelValidationContext } from './index.js';
+import type { UmbServerModelValidationContext } from './server-model-validation.context.js';
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
 
 export const UMB_SERVER_MODEL_VALIDATION_CONTEXT = new UmbContextToken<UmbServerModelValidationContext>(
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/validation/context/server-model-validation.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/validation/controllers/server-model-validation.context.ts
similarity index 97%
rename from src/Umbraco.Web.UI.Client/src/packages/core/validation/context/server-model-validation.context.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/validation/controllers/server-model-validation.context.ts
index 9fd0db8735..b23fa9385e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/validation/context/server-model-validation.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/validation/controllers/server-model-validation.context.ts
@@ -1,7 +1,7 @@
 import type { UmbValidationMessageTranslator } from '../translators/validation-message-translator.interface.js';
 import type { UmbValidator } from '../interfaces/validator.interface.js';
 import { UmbDataPathPropertyValueFilter } from '../utils/data-path-property-value-filter.function.js';
-import { UMB_VALIDATION_CONTEXT } from './validation.context-token.js';
+import { UMB_VALIDATION_CONTEXT } from '../context/validation.context-token.js';
 import { UMB_SERVER_MODEL_VALIDATION_CONTEXT } from './server-model-validation.context-token.js';
 import { UmbContextBase } from '@umbraco-cms/backoffice/class-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
@@ -76,8 +76,6 @@ export class UmbServerModelValidationContext
 				});
 			}
 			// Check if there are missing properties:
-			console.log('send data:', this.#data);
-			console.log('error response:', errorBody);
 			if (errorBody?.missingProperties) {
 				// Retrieve the variants of he send data, as those are the once we will declare as missing properties:
 				errorBody.missingProperties.forEach((alias) => {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/validation/translators/variant-values-validation-message-translator.controller.ts b/src/Umbraco.Web.UI.Client/src/packages/core/validation/translators/variant-values-validation-message-translator.controller.ts
index 531806006c..72bd15df9c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/validation/translators/variant-values-validation-message-translator.controller.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/validation/translators/variant-values-validation-message-translator.controller.ts
@@ -1,4 +1,4 @@
-import type { UmbServerModelValidationContext } from '../context/server-model-validation.context.js';
+import type { UmbServerModelValidationContext } from '../controllers/server-model-validation.context.js';
 import { UmbDataPathPropertyValueFilter } from '../utils/data-path-property-value-filter.function.js';
 import type { UmbValidationMessageTranslator } from './validation-message-translator.interface.js';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';