diff --git a/.prettierignore b/.prettierignore
index 7b4bd636..a7c44559 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -2,3 +2,4 @@ build/
 coverage/
 node_modules/
 public/
+src/forms/index.js
diff --git a/docs/customisation-checklist.md b/docs/customisation-checklist.md
index 160c09d9..deeeb9bd 100644
--- a/docs/customisation-checklist.md
+++ b/docs/customisation-checklist.md
@@ -31,7 +31,7 @@ Some generic things to update and check when starting to customise the template.
   all of them: .html, subject.txt, and text.txt
 * Update [config: bookingUnitType](../src/config.js) if needed
 * If `line-item/units` is used, add quantity handling to
-  [BookingDatesForm](../src/containers/BookingDatesForm/BookingDatesForm.js),
+  [BookingDatesForm](../src/forms/BookingDatesForm/BookingDatesForm.js),
   [ListingPage](../src/containers/ListingPage/ListingPage.js),
   [CheckoutPage](../src/containers/CheckoutPage/CheckoutPage.js)
 
diff --git a/src/components/EditListingDescriptionPanel/EditListingDescriptionPanel.js b/src/components/EditListingDescriptionPanel/EditListingDescriptionPanel.js
index 48f6aac4..17761fbc 100644
--- a/src/components/EditListingDescriptionPanel/EditListingDescriptionPanel.js
+++ b/src/components/EditListingDescriptionPanel/EditListingDescriptionPanel.js
@@ -4,7 +4,7 @@ import classNames from 'classnames';
 import { FormattedMessage } from 'react-intl';
 import { ensureOwnListing } from '../../util/data';
 import { ListingLink } from '../../components';
-import { EditListingDescriptionForm } from '../../containers';
+import { EditListingDescriptionForm } from '../../forms';
 import config from '../../config';
 
 import css from './EditListingDescriptionPanel.css';
diff --git a/src/components/EditListingFeaturesPanel/EditListingFeaturesPanel.js b/src/components/EditListingFeaturesPanel/EditListingFeaturesPanel.js
index d912fb1e..0f306083 100644
--- a/src/components/EditListingFeaturesPanel/EditListingFeaturesPanel.js
+++ b/src/components/EditListingFeaturesPanel/EditListingFeaturesPanel.js
@@ -4,7 +4,7 @@ import classNames from 'classnames';
 import { FormattedMessage } from 'react-intl';
 
 import { ensureListing } from '../../util/data';
-import { EditListingFeaturesForm } from '../../containers';
+import { EditListingFeaturesForm } from '../../forms';
 import { ListingLink } from '../../components';
 
 import css from './EditListingFeaturesPanel.css';
diff --git a/src/components/EditListingLocationPanel/EditListingLocationPanel.js b/src/components/EditListingLocationPanel/EditListingLocationPanel.js
index 84e3c27a..27c3b5d0 100644
--- a/src/components/EditListingLocationPanel/EditListingLocationPanel.js
+++ b/src/components/EditListingLocationPanel/EditListingLocationPanel.js
@@ -4,7 +4,7 @@ import classNames from 'classnames';
 import { FormattedMessage } from 'react-intl';
 import { ensureOwnListing } from '../../util/data';
 import { ListingLink } from '../../components';
-import { EditListingLocationForm } from '../../containers';
+import { EditListingLocationForm } from '../../forms';
 
 import css from './EditListingLocationPanel.css';
 
diff --git a/src/components/EditListingPhotosPanel/EditListingPhotosPanel.js b/src/components/EditListingPhotosPanel/EditListingPhotosPanel.js
index d85be8bd..ae77eaf6 100644
--- a/src/components/EditListingPhotosPanel/EditListingPhotosPanel.js
+++ b/src/components/EditListingPhotosPanel/EditListingPhotosPanel.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { FormattedMessage } from 'react-intl';
 import classNames from 'classnames';
-import { EditListingPhotosForm } from '../../containers';
+import { EditListingPhotosForm } from '../../forms';
 import { ensureOwnListing } from '../../util/data';
 import { ListingLink } from '../../components';
 
diff --git a/src/components/EditListingPoliciesPanel/EditListingPoliciesPanel.js b/src/components/EditListingPoliciesPanel/EditListingPoliciesPanel.js
index 4444b7db..d3b549b1 100644
--- a/src/components/EditListingPoliciesPanel/EditListingPoliciesPanel.js
+++ b/src/components/EditListingPoliciesPanel/EditListingPoliciesPanel.js
@@ -4,7 +4,7 @@ import classNames from 'classnames';
 import { FormattedMessage } from 'react-intl';
 import { ensureOwnListing } from '../../util/data';
 import { ListingLink } from '../../components';
-import { EditListingPoliciesForm } from '../../containers';
+import { EditListingPoliciesForm } from '../../forms';
 
 import css from './EditListingPoliciesPanel.css';
 
diff --git a/src/components/EditListingPricingPanel/EditListingPricingPanel.js b/src/components/EditListingPricingPanel/EditListingPricingPanel.js
index 5d0a2991..78a667ed 100644
--- a/src/components/EditListingPricingPanel/EditListingPricingPanel.js
+++ b/src/components/EditListingPricingPanel/EditListingPricingPanel.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { FormattedMessage } from 'react-intl';
 import { ListingLink } from '../../components';
-import { EditListingPricingForm } from '../../containers';
+import { EditListingPricingForm } from '../../forms';
 import { ensureOwnListing } from '../../util/data';
 import { types as sdkTypes } from '../../util/sdkLoader';
 import config from '../../config';
diff --git a/src/components/EditListingWizard/EditListingWizard.js b/src/components/EditListingWizard/EditListingWizard.js
index da05a740..797d1275 100644
--- a/src/components/EditListingWizard/EditListingWizard.js
+++ b/src/components/EditListingWizard/EditListingWizard.js
@@ -6,7 +6,7 @@ import classNames from 'classnames';
 import { omitBy, isUndefined } from 'lodash';
 import { withViewport } from '../../util/contextHelpers';
 import { ensureListing } from '../../util/data';
-import { PayoutDetailsForm } from '../../containers';
+import { PayoutDetailsForm } from '../../forms';
 import { Modal, NamedRedirect, Tabs } from '../../components';
 
 import EditListingWizardTab, {
diff --git a/src/components/ReviewModal/ReviewModal.js b/src/components/ReviewModal/ReviewModal.js
index d56d5ec5..7290725a 100644
--- a/src/components/ReviewModal/ReviewModal.js
+++ b/src/components/ReviewModal/ReviewModal.js
@@ -4,7 +4,7 @@ import { FormattedMessage, intlShape, injectIntl } from 'react-intl';
 import classNames from 'classnames';
 import { propTypes } from '../../util/types';
 import { IconReviewUser, Modal } from '../../components';
-import { ReviewForm } from '../../containers';
+import { ReviewForm } from '../../forms';
 
 import css from './ReviewModal.css';
 
diff --git a/src/components/SectionHero/SectionHero.js b/src/components/SectionHero/SectionHero.js
index 8986c15e..34c9ef9c 100644
--- a/src/components/SectionHero/SectionHero.js
+++ b/src/components/SectionHero/SectionHero.js
@@ -6,7 +6,7 @@ import { stringify } from '../../util/urlHelpers';
 import { createResourceLocatorString } from '../../util/routes';
 import routeConfiguration from '../../routeConfiguration';
 import { IconSearch, Button } from '../../components';
-import { LocationSearchForm } from '../../containers';
+import { LocationSearchForm } from '../../forms';
 
 import css from './SectionHero.css';
 
diff --git a/src/components/Topbar/Topbar.js b/src/components/Topbar/Topbar.js
index 9332f878..34596723 100644
--- a/src/components/Topbar/Topbar.js
+++ b/src/components/Topbar/Topbar.js
@@ -22,7 +22,7 @@ import {
   TopbarDesktop,
   TopbarMobileMenu,
 } from '../../components';
-import { TopbarSearchForm } from '../../containers';
+import { TopbarSearchForm } from '../../forms';
 
 import MenuIcon from './MenuIcon';
 import SearchIcon from './SearchIcon';
diff --git a/src/components/TopbarDesktop/TopbarDesktop.js b/src/components/TopbarDesktop/TopbarDesktop.js
index f06e3247..43fddd9b 100644
--- a/src/components/TopbarDesktop/TopbarDesktop.js
+++ b/src/components/TopbarDesktop/TopbarDesktop.js
@@ -14,7 +14,7 @@ import {
   MenuItem,
   NamedLink,
 } from '../../components';
-import { TopbarSearchForm } from '../../containers';
+import { TopbarSearchForm } from '../../forms';
 
 import css from './TopbarDesktop.css';
 
diff --git a/src/components/TransactionPanel/TransactionPanel.js b/src/components/TransactionPanel/TransactionPanel.js
index 1323068b..02b106f4 100644
--- a/src/components/TransactionPanel/TransactionPanel.js
+++ b/src/components/TransactionPanel/TransactionPanel.js
@@ -6,7 +6,7 @@ import { txIsEnquired, txIsRequested, propTypes } from '../../util/types';
 import { ensureListing, ensureTransaction, ensureUser } from '../../util/data';
 import { isMobileSafari } from '../../util/userAgent';
 import { AvatarMedium, AvatarLarge, ResponsiveImage, ReviewModal } from '../../components';
-import { SendMessageForm } from '../../containers';
+import { SendMessageForm } from '../../forms';
 
 // These are internal components that make this file more readable.
 import {
diff --git a/src/containers/AuthenticationPage/AuthenticationPage.js b/src/containers/AuthenticationPage/AuthenticationPage.js
index 1435e488..75875c25 100644
--- a/src/containers/AuthenticationPage/AuthenticationPage.js
+++ b/src/containers/AuthenticationPage/AuthenticationPage.js
@@ -28,7 +28,8 @@ import {
   Modal,
   TermsOfService,
 } from '../../components';
-import { LoginForm, SignupForm, TopbarContainer } from '../../containers';
+import { LoginForm, SignupForm } from '../../forms';
+import { TopbarContainer } from '../../containers';
 import { login, authenticationInProgress, signup } from '../../ducks/Auth.duck';
 import { isScrollingDisabled } from '../../ducks/UI.duck';
 import { sendVerificationEmail } from '../../ducks/user.duck';
diff --git a/src/containers/CheckoutPage/CheckoutPage.js b/src/containers/CheckoutPage/CheckoutPage.js
index 447d54a4..242c7f76 100644
--- a/src/containers/CheckoutPage/CheckoutPage.js
+++ b/src/containers/CheckoutPage/CheckoutPage.js
@@ -24,7 +24,7 @@ import {
   Page,
   ResponsiveImage,
 } from '../../components';
-import { StripePaymentForm } from '../../containers';
+import { StripePaymentForm } from '../../forms';
 import { isScrollingDisabled } from '../../ducks/UI.duck';
 import { initiateOrder, setInitialValues, speculateTransaction } from './CheckoutPage.duck';
 import config from '../../config';
diff --git a/src/containers/ContactDetailsPage/ContactDetailsPage.js b/src/containers/ContactDetailsPage/ContactDetailsPage.js
index c74cacdf..fbe5d2fb 100644
--- a/src/containers/ContactDetailsPage/ContactDetailsPage.js
+++ b/src/containers/ContactDetailsPage/ContactDetailsPage.js
@@ -16,7 +16,8 @@ import {
   Page,
   UserNav,
 } from '../../components';
-import { ContactDetailsForm, TopbarContainer } from '../../containers';
+import { ContactDetailsForm } from '../../forms';
+import { TopbarContainer } from '../../containers';
 
 import { isScrollingDisabled } from '../../ducks/UI.duck';
 import { saveContactDetails, saveContactDetailsClear } from './ContactDetailsPage.duck';
diff --git a/src/containers/EmailVerificationPage/EmailVerificationPage.js b/src/containers/EmailVerificationPage/EmailVerificationPage.js
index 0c7e2d52..d0ae80b1 100644
--- a/src/containers/EmailVerificationPage/EmailVerificationPage.js
+++ b/src/containers/EmailVerificationPage/EmailVerificationPage.js
@@ -16,7 +16,8 @@ import {
   LayoutWrapperFooter,
   Footer,
 } from '../../components';
-import { EmailVerificationForm, TopbarContainer } from '../../containers';
+import { EmailVerificationForm } from '../../forms';
+import { TopbarContainer } from '../../containers';
 
 import css from './EmailVerificationPage.css';
 
diff --git a/src/containers/ListingPage/SectionBooking.js b/src/containers/ListingPage/SectionBooking.js
index c568689b..5efa683d 100644
--- a/src/containers/ListingPage/SectionBooking.js
+++ b/src/containers/ListingPage/SectionBooking.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { FormattedMessage } from 'react-intl';
 import { ModalInMobile, Button } from '../../components';
-import { BookingDatesForm } from '../../containers';
+import { BookingDatesForm } from '../../forms';
 
 import css from './ListingPage.css';
 
diff --git a/src/containers/ListingPage/SectionHost.js b/src/containers/ListingPage/SectionHost.js
index a0c4b1ca..d24b39e6 100644
--- a/src/containers/ListingPage/SectionHost.js
+++ b/src/containers/ListingPage/SectionHost.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { FormattedMessage } from 'react-intl';
 import { NamedLink, UserCard, Modal } from '../../components';
-import { EnquiryForm } from '../../containers';
+import { EnquiryForm } from '../../forms';
 
 import css from './ListingPage.css';
 
diff --git a/src/containers/NotFoundPage/NotFoundPage.js b/src/containers/NotFoundPage/NotFoundPage.js
index 755b8ed2..8d9f7ab3 100644
--- a/src/containers/NotFoundPage/NotFoundPage.js
+++ b/src/containers/NotFoundPage/NotFoundPage.js
@@ -15,7 +15,8 @@ import {
   LayoutWrapperFooter,
   Footer,
 } from '../../components';
-import { LocationSearchForm, TopbarContainer } from '../../containers';
+import { LocationSearchForm } from '../../forms';
+import { TopbarContainer } from '../../containers';
 
 import css from './NotFoundPage.css';
 
diff --git a/src/containers/PasswordChangePage/PasswordChangePage.js b/src/containers/PasswordChangePage/PasswordChangePage.js
index b8f6ae2a..7117eb6d 100644
--- a/src/containers/PasswordChangePage/PasswordChangePage.js
+++ b/src/containers/PasswordChangePage/PasswordChangePage.js
@@ -15,7 +15,8 @@ import {
   Page,
   UserNav,
 } from '../../components';
-import { PasswordChangeForm, TopbarContainer } from '../../containers';
+import { PasswordChangeForm } from '../../forms';
+import { TopbarContainer } from '../../containers';
 
 import { changePassword, changePasswordClear } from './PasswordChangePage.duck';
 import css from './PasswordChangePage.css';
diff --git a/src/containers/PasswordRecoveryPage/PasswordRecoveryPage.js b/src/containers/PasswordRecoveryPage/PasswordRecoveryPage.js
index 515cbb81..40c95b23 100644
--- a/src/containers/PasswordRecoveryPage/PasswordRecoveryPage.js
+++ b/src/containers/PasswordRecoveryPage/PasswordRecoveryPage.js
@@ -19,7 +19,8 @@ import {
   LayoutWrapperFooter,
   Footer,
 } from '../../components';
-import { PasswordRecoveryForm, TopbarContainer } from '../../containers';
+import { PasswordRecoveryForm } from '../../forms';
+import { TopbarContainer } from '../../containers';
 
 import {
   recoverPassword,
diff --git a/src/containers/PasswordResetPage/PasswordResetPage.js b/src/containers/PasswordResetPage/PasswordResetPage.js
index 83d27826..3c4cc6d5 100644
--- a/src/containers/PasswordResetPage/PasswordResetPage.js
+++ b/src/containers/PasswordResetPage/PasswordResetPage.js
@@ -18,7 +18,8 @@ import {
   LayoutWrapperFooter,
   Footer,
 } from '../../components';
-import { PasswordResetForm, TopbarContainer } from '../../containers';
+import { PasswordResetForm } from '../../forms';
+import { TopbarContainer } from '../../containers';
 
 import { resetPassword } from './PasswordResetPage.duck';
 import css from './PasswordResetPage.css';
diff --git a/src/containers/PayoutPreferencesPage/PayoutPreferencesPage.js b/src/containers/PayoutPreferencesPage/PayoutPreferencesPage.js
index c8c45d16..c4c2be45 100644
--- a/src/containers/PayoutPreferencesPage/PayoutPreferencesPage.js
+++ b/src/containers/PayoutPreferencesPage/PayoutPreferencesPage.js
@@ -17,7 +17,8 @@ import {
   Page,
   UserNav,
 } from '../../components';
-import { TopbarContainer, PayoutDetailsForm } from '../../containers';
+import { PayoutDetailsForm } from '../../forms';
+import { TopbarContainer } from '../../containers';
 import { savePayoutDetails, loadData } from './PayoutPreferencesPage.duck';
 
 import css from './PayoutPreferencesPage.css';
diff --git a/src/containers/ProfileSettingsPage/ProfileSettingsPage.js b/src/containers/ProfileSettingsPage/ProfileSettingsPage.js
index da066220..e1d9a744 100644
--- a/src/containers/ProfileSettingsPage/ProfileSettingsPage.js
+++ b/src/containers/ProfileSettingsPage/ProfileSettingsPage.js
@@ -16,7 +16,8 @@ import {
   Footer,
   NamedLink,
 } from '../../components';
-import { ProfileSettingsForm, TopbarContainer } from '../../containers';
+import { ProfileSettingsForm } from '../../forms';
+import { TopbarContainer } from '../../containers';
 
 import { updateProfile, uploadImage } from './ProfileSettingsPage.duck';
 import css from './ProfileSettingsPage.css';
diff --git a/src/containers/index.js b/src/containers/index.js
index bf2134cf..a8e1ff55 100644
--- a/src/containers/index.js
+++ b/src/containers/index.js
@@ -1,54 +1,24 @@
 export { default as AboutPage } from './AboutPage/AboutPage';
 export { default as AuthenticationPage } from './AuthenticationPage/AuthenticationPage';
-export { default as BookingDatesForm } from './BookingDatesForm/BookingDatesForm';
 export { default as CheckoutPage } from './CheckoutPage/CheckoutPage';
-export { default as ContactDetailsForm } from './ContactDetailsForm/ContactDetailsForm';
 export { default as ContactDetailsPage } from './ContactDetailsPage/ContactDetailsPage';
-export {
-  default as EditListingDescriptionForm,
-} from './EditListingDescriptionForm/EditListingDescriptionForm';
-export {
-  default as EditListingFeaturesForm,
-} from './EditListingFeaturesForm/EditListingFeaturesForm';
-export {
-  default as EditListingLocationForm,
-} from './EditListingLocationForm/EditListingLocationForm';
 export { default as EditListingPage } from './EditListingPage/EditListingPage';
-export { default as EditListingPhotosForm } from './EditListingPhotosForm/EditListingPhotosForm';
-export {
-  default as EditListingPoliciesForm,
-} from './EditListingPoliciesForm/EditListingPoliciesForm';
-export { default as EditListingPricingForm } from './EditListingPricingForm/EditListingPricingForm';
-export { default as EmailVerificationForm } from './EmailVerificationForm/EmailVerificationForm';
 export { default as EmailVerificationPage } from './EmailVerificationPage/EmailVerificationPage';
-export { default as EnquiryForm } from './EnquiryForm/EnquiryForm';
 export { default as InboxPage } from './InboxPage/InboxPage';
 export { default as LandingPage } from './LandingPage/LandingPage';
 export { default as ListingPage } from './ListingPage/ListingPage';
-export { default as LocationSearchForm } from './LocationSearchForm/LocationSearchForm';
-export { default as LoginForm } from './LoginForm/LoginForm';
 export { default as ManageListingsPage } from './ManageListingsPage/ManageListingsPage';
 export { default as NotFoundPage } from './NotFoundPage/NotFoundPage';
-export { default as PasswordChangeForm } from './PasswordChangeForm/PasswordChangeForm';
 export { default as PasswordChangePage } from './PasswordChangePage/PasswordChangePage';
-export { default as PasswordRecoveryForm } from './PasswordRecoveryForm/PasswordRecoveryForm';
 export { default as PasswordRecoveryPage } from './PasswordRecoveryPage/PasswordRecoveryPage';
-export { default as PasswordResetForm } from './PasswordResetForm/PasswordResetForm';
 export { default as PasswordResetPage } from './PasswordResetPage/PasswordResetPage';
-export { default as PayoutDetailsForm } from './PayoutDetailsForm/PayoutDetailsForm';
 export { default as PayoutPreferencesPage } from './PayoutPreferencesPage/PayoutPreferencesPage';
 export { default as PrivacyPolicyPage } from './PrivacyPolicyPage/PrivacyPolicyPage';
 export { default as ProfilePage } from './ProfilePage/ProfilePage';
-export { default as ProfileSettingsForm } from './ProfileSettingsForm/ProfileSettingsForm';
 export { default as ProfileSettingsPage } from './ProfileSettingsPage/ProfileSettingsPage';
-export { default as ReviewForm } from './ReviewForm/ReviewForm';
 export { default as SearchPage } from './SearchPage/SearchPage';
-export { default as SendMessageForm } from './SendMessageForm/SendMessageForm';
-export { default as SignupForm } from './SignupForm/SignupForm';
 export { default as StaticPage } from './StaticPage/StaticPage';
-export { default as StripePaymentForm } from './StripePaymentForm/StripePaymentForm';
 export { default as StyleguidePage } from './StyleguidePage/StyleguidePage';
 export { default as TermsOfServicePage } from './TermsOfServicePage/TermsOfServicePage';
 export { default as TopbarContainer } from './TopbarContainer/TopbarContainer';
-export { default as TopbarSearchForm } from './TopbarSearchForm/TopbarSearchForm';
 export { default as TransactionPage } from './TransactionPage/TransactionPage';
diff --git a/src/examples.js b/src/examples.js
index b7043bcc..846be757 100644
--- a/src/examples.js
+++ b/src/examples.js
@@ -60,25 +60,27 @@ import * as TextInputField from './components/TextInputField/TextInputField.exam
 import * as TopbarDesktop from './components/TopbarDesktop/TopbarDesktop.example';
 import * as UserCard from './components/UserCard/UserCard.example';
 
+// forms
+import * as BookingDatesForm from './forms/BookingDatesForm/BookingDatesForm.example';
+import * as EditListingDescriptionForm from './forms/EditListingDescriptionForm/EditListingDescriptionForm.example';
+import * as EditListingFeaturesForm from './forms/EditListingFeaturesForm/EditListingFeaturesForm.example';
+import * as EditListingLocationForm from './forms/EditListingLocationForm/EditListingLocationForm.example';
+import * as EditListingPhotosForm from './forms/EditListingPhotosForm/EditListingPhotosForm.example';
+import * as EditListingPoliciesForm from './forms/EditListingPoliciesForm/EditListingPoliciesForm.example';
+import * as EditListingPricingForm from './forms/EditListingPricingForm/EditListingPricingForm.example';
+import * as EmailVerificationForm from './forms/EmailVerificationForm/EmailVerificationForm.example';
+import * as EnquiryForm from './forms/EnquiryForm/EnquiryForm.example';
+import * as LoginForm from './forms/LoginForm/LoginForm.example';
+import * as PasswordRecoveryForm from './forms/PasswordRecoveryForm/PasswordRecoveryForm.example';
+import * as PasswordResetForm from './forms/PasswordResetForm/PasswordResetForm.example';
+import * as PayoutDetailsForm from './forms/PayoutDetailsForm/PayoutDetailsForm.example';
+import * as ReviewForm from './forms/ReviewForm/ReviewForm.example';
+import * as SendMessageForm from './forms/SendMessageForm/SendMessageForm.example';
+import * as SignupForm from './forms/SignupForm/SignupForm.example';
+import * as StripePaymentForm from './forms/StripePaymentForm/StripePaymentForm.example';
+
 // containers
-import * as BookingDatesForm from './containers/BookingDatesForm/BookingDatesForm.example';
 import * as Colors from './containers/StyleguidePage/Colors.example';
-import * as EditListingDescriptionForm from './containers/EditListingDescriptionForm/EditListingDescriptionForm.example';
-import * as EditListingFeaturesForm from './containers/EditListingFeaturesForm/EditListingFeaturesForm.example';
-import * as EditListingLocationForm from './containers/EditListingLocationForm/EditListingLocationForm.example';
-import * as EditListingPhotosForm from './containers/EditListingPhotosForm/EditListingPhotosForm.example';
-import * as EditListingPoliciesForm from './containers/EditListingPoliciesForm/EditListingPoliciesForm.example';
-import * as EditListingPricingForm from './containers/EditListingPricingForm/EditListingPricingForm.example';
-import * as EmailVerificationForm from './containers/EmailVerificationForm/EmailVerificationForm.example';
-import * as EnquiryForm from './containers/EnquiryForm/EnquiryForm.example';
-import * as LoginForm from './containers/LoginForm/LoginForm.example';
-import * as PasswordRecoveryForm from './containers/PasswordRecoveryForm/PasswordRecoveryForm.example';
-import * as PasswordResetForm from './containers/PasswordResetForm/PasswordResetForm.example';
-import * as PayoutDetailsForm from './containers/PayoutDetailsForm/PayoutDetailsForm.example';
-import * as ReviewForm from './containers/ReviewForm/ReviewForm.example';
-import * as SendMessageForm from './containers/SendMessageForm/SendMessageForm.example';
-import * as SignupForm from './containers/SignupForm/SignupForm.example';
-import * as StripePaymentForm from './containers/StripePaymentForm/StripePaymentForm.example';
 import * as Typography from './containers/StyleguidePage/Typography.example';
 
 export {
diff --git a/src/forms/index.js b/src/forms/index.js
new file mode 100644
index 00000000..1d2a9979
--- /dev/null
+++ b/src/forms/index.js
@@ -0,0 +1,22 @@
+export { default as BookingDatesForm } from './BookingDatesForm/BookingDatesForm';
+export { default as ContactDetailsForm } from './ContactDetailsForm/ContactDetailsForm';
+export { default as EditListingDescriptionForm } from './EditListingDescriptionForm/EditListingDescriptionForm';
+export { default as EditListingFeaturesForm } from './EditListingFeaturesForm/EditListingFeaturesForm';
+export { default as EditListingLocationForm } from './EditListingLocationForm/EditListingLocationForm';
+export { default as EditListingPhotosForm } from './EditListingPhotosForm/EditListingPhotosForm';
+export { default as EditListingPoliciesForm } from './EditListingPoliciesForm/EditListingPoliciesForm';
+export { default as EditListingPricingForm } from './EditListingPricingForm/EditListingPricingForm';
+export { default as EmailVerificationForm } from './EmailVerificationForm/EmailVerificationForm';
+export { default as EnquiryForm } from './EnquiryForm/EnquiryForm';
+export { default as LocationSearchForm } from './LocationSearchForm/LocationSearchForm';
+export { default as LoginForm } from './LoginForm/LoginForm';
+export { default as PasswordChangeForm } from './PasswordChangeForm/PasswordChangeForm';
+export { default as PasswordRecoveryForm } from './PasswordRecoveryForm/PasswordRecoveryForm';
+export { default as PasswordResetForm } from './PasswordResetForm/PasswordResetForm';
+export { default as PayoutDetailsForm } from './PayoutDetailsForm/PayoutDetailsForm';
+export { default as ProfileSettingsForm } from './ProfileSettingsForm/ProfileSettingsForm';
+export { default as ReviewForm } from './ReviewForm/ReviewForm';
+export { default as SendMessageForm } from './SendMessageForm/SendMessageForm';
+export { default as SignupForm } from './SignupForm/SignupForm';
+export { default as StripePaymentForm } from './StripePaymentForm/StripePaymentForm';
+export { default as TopbarSearchForm } from './TopbarSearchForm/TopbarSearchForm';