diff --git a/judgels-client/src/routes/courses/courses/single/chapters/single/lessons/single/ChapterLessonPage/ChapterLessonPage.jsx b/judgels-client/src/routes/courses/courses/single/chapters/single/lessons/single/ChapterLessonPage/ChapterLessonPage.jsx
index 17c171c40..662dc708b 100644
--- a/judgels-client/src/routes/courses/courses/single/chapters/single/lessons/single/ChapterLessonPage/ChapterLessonPage.jsx
+++ b/judgels-client/src/routes/courses/courses/single/chapters/single/lessons/single/ChapterLessonPage/ChapterLessonPage.jsx
@@ -13,7 +13,7 @@ import { selectCourseChapters } from '../../../../modules/courseChaptersSelector
 import { ChapterNavigation } from '../../../resources/ChapterNavigation/ChapterNavigation';
 
 import * as breadcrumbsActions from '../../../../../../../../../modules/breadcrumbs/breadcrumbsActions';
-import * as chapterLessonActions from '../../modules/chapterLessonActions';
+import * as chapterLessonActions from '../modules/chapterLessonActions';
 
 import './ChapterLessonPage.scss';
 
diff --git a/judgels-client/src/routes/courses/courses/single/chapters/single/lessons/modules/chapterLessonActions.js b/judgels-client/src/routes/courses/courses/single/chapters/single/lessons/single/modules/chapterLessonActions.js
similarity index 57%
rename from judgels-client/src/routes/courses/courses/single/chapters/single/lessons/modules/chapterLessonActions.js
rename to judgels-client/src/routes/courses/courses/single/chapters/single/lessons/single/modules/chapterLessonActions.js
index 6d396d8b5..472043dc6 100644
--- a/judgels-client/src/routes/courses/courses/single/chapters/single/lessons/modules/chapterLessonActions.js
+++ b/judgels-client/src/routes/courses/courses/single/chapters/single/lessons/single/modules/chapterLessonActions.js
@@ -1,5 +1,5 @@
-import { chapterLessonAPI } from '../../../../../../../../modules/api/jerahmeel/chapterLesson';
-import { selectToken } from '../../../../../../../../modules/session/sessionSelectors';
+import { chapterLessonAPI } from '../../../../../../../../../modules/api/jerahmeel/chapterLesson';
+import { selectToken } from '../../../../../../../../../modules/session/sessionSelectors';
 
 export function getLessonStatement(chapterJid, lessonAlias, language) {
   return async (dispatch, getState) => {
diff --git a/judgels-client/src/routes/courses/courses/single/chapters/single/lessons/modules/chapterLessonActions.test.js b/judgels-client/src/routes/courses/courses/single/chapters/single/lessons/single/modules/chapterLessonActions.test.js
similarity index 93%
rename from judgels-client/src/routes/courses/courses/single/chapters/single/lessons/modules/chapterLessonActions.test.js
rename to judgels-client/src/routes/courses/courses/single/chapters/single/lessons/single/modules/chapterLessonActions.test.js
index 779c3913e..9a46115bd 100644
--- a/judgels-client/src/routes/courses/courses/single/chapters/single/lessons/modules/chapterLessonActions.test.js
+++ b/judgels-client/src/routes/courses/courses/single/chapters/single/lessons/single/modules/chapterLessonActions.test.js
@@ -2,7 +2,7 @@ import nock from 'nock';
 import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 
-import { nockJerahmeel } from '../../../../../../../../utils/nock';
+import { nockJerahmeel } from '../../../../../../../../../utils/nock';
 
 import * as chapterLessonActions from './chapterLessonActions';
 
diff --git a/judgels-client/src/routes/courses/courses/single/chapters/single/problems/single/ChapterProblemPage/ChapterProblemPage.jsx b/judgels-client/src/routes/courses/courses/single/chapters/single/problems/single/ChapterProblemPage/ChapterProblemPage.jsx
index 6c5f64319..f55d628f3 100644
--- a/judgels-client/src/routes/courses/courses/single/chapters/single/problems/single/ChapterProblemPage/ChapterProblemPage.jsx
+++ b/judgels-client/src/routes/courses/courses/single/chapters/single/problems/single/ChapterProblemPage/ChapterProblemPage.jsx
@@ -21,7 +21,7 @@ import {
 } from '../modules/chapterProblemSelectors';
 
 import * as breadcrumbsActions from '../../../../../../../../../modules/breadcrumbs/breadcrumbsActions';
-import * as chapterProblemActions from '../../modules/chapterProblemActions';
+import * as chapterProblemActions from '../modules/chapterProblemActions';
 
 import './ChapterProblemPage.scss';
 
diff --git a/judgels-client/src/routes/courses/courses/single/chapters/single/problems/single/Programming/submissions/single/ChapterProblemSubmissionPage/ChapterProblemSubmissionPage.jsx b/judgels-client/src/routes/courses/courses/single/chapters/single/problems/single/Programming/submissions/single/ChapterProblemSubmissionPage/ChapterProblemSubmissionPage.jsx
index 109efa5d1..3d7bdcf6d 100644
--- a/judgels-client/src/routes/courses/courses/single/chapters/single/problems/single/Programming/submissions/single/ChapterProblemSubmissionPage/ChapterProblemSubmissionPage.jsx
+++ b/judgels-client/src/routes/courses/courses/single/chapters/single/problems/single/Programming/submissions/single/ChapterProblemSubmissionPage/ChapterProblemSubmissionPage.jsx
@@ -13,7 +13,7 @@ import { selectCourse } from '../../../../../../../../../modules/courseSelectors
 import { selectCourseChapter } from '../../../../../../../modules/courseChapterSelectors';
 
 import * as breadcrumbsActions from '../../../../../../../../../../../../modules/breadcrumbs/breadcrumbsActions';
-import * as chapterProblemActions from '../../../../../modules/chapterProblemActions';
+import * as chapterProblemActions from '../../../../modules/chapterProblemActions';
 import * as chapterProblemSubmissionActions from '../../modules/chapterProblemSubmissionActions';
 
 export class ChapterProblemSubmissionPage extends Component {
diff --git a/judgels-client/src/routes/courses/courses/single/chapters/single/problems/modules/chapterProblemActions.js b/judgels-client/src/routes/courses/courses/single/chapters/single/problems/single/modules/chapterProblemActions.js
similarity index 63%
rename from judgels-client/src/routes/courses/courses/single/chapters/single/problems/modules/chapterProblemActions.js
rename to judgels-client/src/routes/courses/courses/single/chapters/single/problems/single/modules/chapterProblemActions.js
index 1f6a13638..7c9076d25 100644
--- a/judgels-client/src/routes/courses/courses/single/chapters/single/problems/modules/chapterProblemActions.js
+++ b/judgels-client/src/routes/courses/courses/single/chapters/single/problems/single/modules/chapterProblemActions.js
@@ -1,6 +1,6 @@
-import { chapterProblemAPI } from '../../../../../../../../modules/api/jerahmeel/chapterProblem';
-import { selectToken } from '../../../../../../../../modules/session/sessionSelectors';
-import { RefreshChapterProblem } from '../single/modules/chapterProblemReducer';
+import { chapterProblemAPI } from '../../../../../../../../../modules/api/jerahmeel/chapterProblem';
+import { selectToken } from '../../../../../../../../../modules/session/sessionSelectors';
+import { RefreshChapterProblem } from './chapterProblemReducer';
 
 export function getProblemWorksheet(chapterJid, problemAlias, language) {
   return async (dispatch, getState) => {
diff --git a/judgels-client/src/routes/courses/courses/single/chapters/single/problems/modules/chapterProblemActions.test.js b/judgels-client/src/routes/courses/courses/single/chapters/single/problems/single/modules/chapterProblemActions.test.js
similarity index 93%
rename from judgels-client/src/routes/courses/courses/single/chapters/single/problems/modules/chapterProblemActions.test.js
rename to judgels-client/src/routes/courses/courses/single/chapters/single/problems/single/modules/chapterProblemActions.test.js
index 6cb1edf9e..409f6ff80 100644
--- a/judgels-client/src/routes/courses/courses/single/chapters/single/problems/modules/chapterProblemActions.test.js
+++ b/judgels-client/src/routes/courses/courses/single/chapters/single/problems/single/modules/chapterProblemActions.test.js
@@ -2,7 +2,7 @@ import nock from 'nock';
 import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 
-import { nockJerahmeel } from '../../../../../../../../utils/nock';
+import { nockJerahmeel } from '../../../../../../../../../utils/nock';
 
 import * as chapterProblemActions from './chapterProblemActions';