diff --git a/src/components/Form/IpaCalendar.tsx b/src/components/Form/IpaCalendar/IpaCalendar.tsx
similarity index 96%
rename from src/components/Form/IpaCalendar.tsx
rename to src/components/Form/IpaCalendar/IpaCalendar.tsx
index b8812c7b..c53fd305 100644
--- a/src/components/Form/IpaCalendar.tsx
+++ b/src/components/Form/IpaCalendar/IpaCalendar.tsx
@@ -10,7 +10,7 @@ import {
 } from "src/utils/ipaObjectUtils";
 import { ParamMetadata } from "src/utils/datatypes/globalDataTypes";
 // Components
-import DateTimeSelector from "./DateTimeSelector/DateTimeSelector";
+import DateTimeSelector from "../DateTimeSelector/DateTimeSelector";
 
 export interface DateParam {
   __datetime__: string;
diff --git a/src/components/UsersSections/UsersAccountSettings.tsx b/src/components/UsersSections/UsersAccountSettings.tsx
index ffc93dc3..984ba2b6 100644
--- a/src/components/UsersSections/UsersAccountSettings.tsx
+++ b/src/components/UsersSections/UsersAccountSettings.tsx
@@ -27,7 +27,7 @@ import IpaTextInput from "src/components/Form/IpaTextInput";
 import IpaSelect from "../Form/IpaSelect";
 import IpaCheckboxes from "../Form/IpaCheckboxes";
 import PrincipalAliasMultiTextBox from "../Form/PrincipalAliasMultiTextBox";
-import IpaCalendar from "../Form/IpaCalendar";
+import IpaCalendar from "../Form/IpaCalendar/IpaCalendar";
 import IpaSshPublicKeys from "../Form/IpaSshPublicKeys";
 import IpaCertificates from "../Form/IpaCertificates";
 import IpaCertificateMappingData from "../Form/IpaCertificateMappingData";