diff --git a/app/jsx/assignments_2/teacher/components/ContentTabs.js b/app/jsx/assignments_2/teacher/components/ContentTabs.js
index 9dd7b55bc86..7f01c01b451 100644
--- a/app/jsx/assignments_2/teacher/components/ContentTabs.js
+++ b/app/jsx/assignments_2/teacher/components/ContentTabs.js
@@ -22,7 +22,7 @@ import I18n from 'i18n!assignments_2'
 import TabList, {TabPanel} from '@instructure/ui-tabs/lib/components/TabList'
 import {TeacherAssignmentShape} from '../assignmentData'
 import Details from './Details'
-import StudentsSearcher from './StudentsSearcher'
+import StudentsSearcher from './StudentsTab/StudentsSearcher'
 import {Img} from '@instructure/ui-elements'
 
 ContentTabs.propTypes = {
diff --git a/app/jsx/assignments_2/teacher/components/StudentSearchQuery.js b/app/jsx/assignments_2/teacher/components/StudentsTab/StudentSearchQuery.js
similarity index 98%
rename from app/jsx/assignments_2/teacher/components/StudentSearchQuery.js
rename to app/jsx/assignments_2/teacher/components/StudentsTab/StudentSearchQuery.js
index 2e6f5550b7b..96338c1aeb1 100644
--- a/app/jsx/assignments_2/teacher/components/StudentSearchQuery.js
+++ b/app/jsx/assignments_2/teacher/components/StudentsTab/StudentSearchQuery.js
@@ -24,7 +24,7 @@ import View from '@instructure/ui-layout/lib/components/View'
 
 import I18n from 'i18n!assignments_2'
 
-import {STUDENT_SEARCH_QUERY, StudentSearchQueryShape} from '../assignmentData'
+import {STUDENT_SEARCH_QUERY, StudentSearchQueryShape} from '../../assignmentData'
 
 StudentSearchQuery.propTypes = {
   children: func,
diff --git a/app/jsx/assignments_2/teacher/components/StudentTray.js b/app/jsx/assignments_2/teacher/components/StudentsTab/StudentTray.js
similarity index 98%
rename from app/jsx/assignments_2/teacher/components/StudentTray.js
rename to app/jsx/assignments_2/teacher/components/StudentsTab/StudentTray.js
index 61ca66bce60..fec3a9642dc 100644
--- a/app/jsx/assignments_2/teacher/components/StudentTray.js
+++ b/app/jsx/assignments_2/teacher/components/StudentsTab/StudentTray.js
@@ -22,13 +22,13 @@ import I18n from 'i18n!assignments_2'
 import ScreenReaderContent from '@instructure/ui-a11y/lib/components/ScreenReaderContent'
 
 import {bool, func} from 'prop-types'
-import {TeacherAssignmentShape, UserShape} from '../assignmentData'
+import {TeacherAssignmentShape, UserShape} from '../../assignmentData'
 import {Flex, FlexItem, View} from '@instructure/ui-layout'
 import {Button, CloseButton} from '@instructure/ui-buttons'
 import {Avatar, Heading, Link, Text} from '@instructure/ui-elements'
 import {Tray} from '@instructure/ui-overlays'
 import {DateTimeInput} from '@instructure/ui-forms'
-import OverrideAttempts from './Overrides/OverrideAttempts'
+import OverrideAttempts from '../Overrides/OverrideAttempts'
 import {
   IconArrowOpenEndLine,
   IconArrowOpenStartLine,
diff --git a/app/jsx/assignments_2/teacher/components/StudentsSearcher.js b/app/jsx/assignments_2/teacher/components/StudentsTab/StudentsSearcher.js
similarity index 99%
rename from app/jsx/assignments_2/teacher/components/StudentsSearcher.js
rename to app/jsx/assignments_2/teacher/components/StudentsTab/StudentsSearcher.js
index c576423f894..e37aa1123ae 100644
--- a/app/jsx/assignments_2/teacher/components/StudentsSearcher.js
+++ b/app/jsx/assignments_2/teacher/components/StudentsTab/StudentsSearcher.js
@@ -32,7 +32,7 @@ import {
 } from '@instructure/ui-icons'
 import {Badge} from '@instructure/ui-elements'
 
-import {TeacherAssignmentShape} from '../assignmentData'
+import {TeacherAssignmentShape} from '../../assignmentData'
 import StudentSearchQuery from './StudentSearchQuery'
 import StudentsTable from './StudentsTable'
 import Flex, {FlexItem} from '@instructure/ui-layout/lib/components/Flex'
diff --git a/app/jsx/assignments_2/teacher/components/StudentsTable.js b/app/jsx/assignments_2/teacher/components/StudentsTab/StudentsTable.js
similarity index 97%
rename from app/jsx/assignments_2/teacher/components/StudentsTable.js
rename to app/jsx/assignments_2/teacher/components/StudentsTab/StudentsTable.js
index 1ca7c09a4f8..fcce6726298 100644
--- a/app/jsx/assignments_2/teacher/components/StudentsTable.js
+++ b/app/jsx/assignments_2/teacher/components/StudentsTab/StudentsTable.js
@@ -22,15 +22,15 @@ import I18n from 'i18n!assignments_2'
 
 import ScreenReaderContent from '@instructure/ui-a11y/lib/components/ScreenReaderContent'
 
-import {TeacherAssignmentShape, SubmissionShape} from '../assignmentData'
+import {TeacherAssignmentShape, SubmissionShape} from '../../assignmentData'
 
 import View from '@instructure/ui-layout/lib/components/View'
 import {Table} from '@instructure/ui-table'
 import Button from '@instructure/ui-buttons/lib/components/Button'
 import IconExpandStart from '@instructure/ui-icons/lib/Line/IconExpandStart'
 import Avatar from '@instructure/ui-elements/lib/components/Avatar'
-import SubmissionStatusPill from '../../shared/SubmissionStatusPill'
-import FriendlyDatetime from '../../../shared/FriendlyDatetime'
+import SubmissionStatusPill from '../../../shared/SubmissionStatusPill'
+import FriendlyDatetime from '../../../../shared/FriendlyDatetime'
 import Link from '@instructure/ui-elements/lib/components/Link'
 import StudentTray from './StudentTray'
 
diff --git a/app/jsx/assignments_2/teacher/components/__tests__/StudentTray.test.js b/app/jsx/assignments_2/teacher/components/StudentsTab/__tests__/StudentTray.test.js
similarity index 99%
rename from app/jsx/assignments_2/teacher/components/__tests__/StudentTray.test.js
rename to app/jsx/assignments_2/teacher/components/StudentsTab/__tests__/StudentTray.test.js
index 7e7c9e6fb37..16e4bcd8466 100644
--- a/app/jsx/assignments_2/teacher/components/__tests__/StudentTray.test.js
+++ b/app/jsx/assignments_2/teacher/components/StudentsTab/__tests__/StudentTray.test.js
@@ -18,7 +18,7 @@
 
 import React from 'react'
 import {render} from 'react-testing-library'
-import {closest, mockAssignment, mockUser, mockSubmission} from '../../test-utils'
+import {closest, mockAssignment, mockUser, mockSubmission} from '../../../test-utils'
 import StudentTray from '../StudentTray'
 
 describe('student tray data', () => {
diff --git a/app/jsx/assignments_2/teacher/components/__tests__/StudentsSearcher.test.js b/app/jsx/assignments_2/teacher/components/StudentsTab/__tests__/StudentsSearcher.test.js
similarity index 98%
rename from app/jsx/assignments_2/teacher/components/__tests__/StudentsSearcher.test.js
rename to app/jsx/assignments_2/teacher/components/StudentsTab/__tests__/StudentsSearcher.test.js
index c443e4036a6..816872ef251 100644
--- a/app/jsx/assignments_2/teacher/components/__tests__/StudentsSearcher.test.js
+++ b/app/jsx/assignments_2/teacher/components/StudentsTab/__tests__/StudentsSearcher.test.js
@@ -20,8 +20,8 @@ import React from 'react'
 import {render, fireEvent} from 'react-testing-library'
 import MockDate from 'mockdate'
 import CanvasValidatedMockedProvider from 'jsx/__tests__/CanvasValidatedMockedProvider'
-import {STUDENT_SEARCH_QUERY} from '../../assignmentData'
-import {mockAssignment, mockSubmission, mockUser, closest} from '../../test-utils'
+import {STUDENT_SEARCH_QUERY} from '../../../assignmentData'
+import {mockAssignment, mockSubmission, mockUser, closest} from '../../../test-utils'
 import StudentsSearcher from '../StudentsSearcher'
 
 function mockRequest({users = [mockUser()], variables = {}}) {
diff --git a/app/jsx/assignments_2/teacher/components/__tests__/StudentsTable.test.js b/app/jsx/assignments_2/teacher/components/StudentsTab/__tests__/StudentsTable.test.js
similarity index 99%
rename from app/jsx/assignments_2/teacher/components/__tests__/StudentsTable.test.js
rename to app/jsx/assignments_2/teacher/components/StudentsTab/__tests__/StudentsTable.test.js
index 03f9732e7c7..173b9d64c7a 100644
--- a/app/jsx/assignments_2/teacher/components/__tests__/StudentsTable.test.js
+++ b/app/jsx/assignments_2/teacher/components/StudentsTab/__tests__/StudentsTable.test.js
@@ -18,7 +18,7 @@
 
 import React from 'react'
 import {render} from 'react-testing-library'
-import {closest, mockAssignment, mockUser, mockSubmission} from '../../test-utils'
+import {closest, mockAssignment, mockUser, mockSubmission} from '../../../test-utils'
 import apiUserContent from 'compiled/str/apiUserContent'
 import StudentsTable from '../StudentsTable'