diff --git a/.eslintrc.js b/.eslintrc.js
index 7bd70be0..6c2bffa2 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -48,6 +48,5 @@ module.exports = createConfig('eslint', {
       },
     ],
     'function-paren-newline': 'off',
-    'import/no-cycle': 'off',
   },
 });
diff --git a/src/MainApp.jsx b/src/MainApp.jsx
index 684ab1d9..862a0b24 100755
--- a/src/MainApp.jsx
+++ b/src/MainApp.jsx
@@ -6,7 +6,7 @@ import { Helmet } from 'react-helmet';
 import { Redirect, Route, Switch } from 'react-router-dom';
 
 import {
-  Logistration, NotFoundPage, registerIcons, UnAuthOnlyRoute, Zendesk,
+  NotFoundPage, registerIcons, UnAuthOnlyRoute, Zendesk,
 } from './common-components';
 import configureStore from './data/configureStore';
 import {
@@ -20,6 +20,7 @@ import {
 } from './data/constants';
 import { updatePathWithQueryParams } from './data/utils';
 import { ForgotPasswordPage } from './forgot-password';
+import Logistration from './logistration/Logistration';
 import { ProgressiveProfiling } from './progressive-profiling';
 import { RecommendationsPage } from './recommendations';
 import { ResetPasswordPage } from './reset-password';
diff --git a/src/common-components/index.jsx b/src/common-components/index.jsx
index 43223bb7..b427910b 100644
--- a/src/common-components/index.jsx
+++ b/src/common-components/index.jsx
@@ -11,5 +11,4 @@ export { default as saga } from './data/sagas';
 export { storeName } from './data/selectors';
 export { default as FormGroup } from './FormGroup';
 export { default as PasswordField } from './PasswordField';
-export { default as Logistration } from './Logistration';
 export { default as Zendesk } from './Zendesk';
diff --git a/src/common-components/Logistration.jsx b/src/logistration/Logistration.jsx
similarity index 96%
rename from src/common-components/Logistration.jsx
rename to src/logistration/Logistration.jsx
index 6790ae55..b7498115 100644
--- a/src/common-components/Logistration.jsx
+++ b/src/logistration/Logistration.jsx
@@ -14,12 +14,12 @@ import { ChevronLeft } from '@edx/paragon/icons';
 import PropTypes from 'prop-types';
 import { Redirect } from 'react-router-dom';
 
-import { clearThirdPartyAuthContextErrorMessage } from './data/actions';
+import { BaseComponent } from '../base-component';
+import { clearThirdPartyAuthContextErrorMessage } from '../common-components/data/actions';
 import {
   tpaProvidersSelector,
-} from './data/selectors';
-import messages from './messages';
-import { BaseComponent } from '../base-component';
+} from '../common-components/data/selectors';
+import messages from '../common-components/messages';
 import { LOGIN_PAGE, REGISTER_PAGE } from '../data/constants';
 import { getTpaHint, getTpaProvider, updatePathWithQueryParams } from '../data/utils';
 import { LoginPage } from '../login';
diff --git a/src/common-components/tests/Logistration.test.jsx b/src/logistration/Logistration.test.jsx
similarity index 95%
rename from src/common-components/tests/Logistration.test.jsx
rename to src/logistration/Logistration.test.jsx
index 1d027bb5..2b0265c0 100644
--- a/src/common-components/tests/Logistration.test.jsx
+++ b/src/logistration/Logistration.test.jsx
@@ -8,11 +8,11 @@ import { mount } from 'enzyme';
 import { MemoryRouter } from 'react-router-dom';
 import configureStore from 'redux-mock-store';
 
-import { COMPLETE_STATE, LOGIN_PAGE } from '../../data/constants';
-import { backupRegistrationForm } from '../../register/data/actions';
-import { clearThirdPartyAuthContextErrorMessage } from '../data/actions';
-import { RenderInstitutionButton } from '../InstitutionLogistration';
-import Logistration from '../Logistration';
+import Logistration from './Logistration';
+import { clearThirdPartyAuthContextErrorMessage } from '../common-components/data/actions';
+import { RenderInstitutionButton } from '../common-components/InstitutionLogistration';
+import { COMPLETE_STATE, LOGIN_PAGE } from '../data/constants';
+import { backupRegistrationForm } from '../register/data/actions';
 
 jest.mock('@edx/frontend-platform/analytics', () => ({
   sendPageEvent: jest.fn(),