diff --git a/src/index.jsx b/src/index.jsx
index e8aa6938..37658ac8 100755
--- a/src/index.jsx
+++ b/src/index.jsx
@@ -27,7 +27,7 @@ import { TabContainer } from './tab-page';
 import { fetchDatesTab, fetchOutlineTab, fetchProgressTab } from './course-home/data';
 import { fetchCourse } from './courseware/data';
 import initializeStore from './store';
-import NexBlockPage from './plugin-test/NexBlockPage';
+import NexBlockContainer from './nexblocks/NexBlockContainer';
 import PluginTestPage from './plugin-test/PluginTestPage';
 
 subscribe(APP_READY, () => {
@@ -35,39 +35,41 @@ subscribe(APP_READY, () => {
     <AppProvider store={initializeStore()}>
       <UserMessagesProvider>
         <Switch>
-          <Route exact path="/plugintest" component={PluginTestPage} />
-          <Route exact path="/nexblock" component={NexBlockPage} />
-          <PageRoute path="/redirect" component={CoursewareRedirectLandingPage} />
-          <PageRoute path="/course/:courseId/home">
-            <TabContainer tab="outline" fetch={fetchOutlineTab} slice="courseHome">
-              <OutlineTab />
-            </TabContainer>
-          </PageRoute>
-          <PageRoute path="/course/:courseId/dates">
-            <TabContainer tab="dates" fetch={fetchDatesTab} slice="courseHome">
-              <DatesTab />
-            </TabContainer>
-          </PageRoute>
-          <PageRoute path="/course/:courseId/progress">
-            <TabContainer tab="progress" fetch={fetchProgressTab} slice="courseHome">
-              <ProgressTab />
-            </TabContainer>
-          </PageRoute>
-          <PageRoute path="/course/:courseId/course-end">
-            <TabContainer tab="courseware" fetch={fetchCourse} slice="courseware">
-              <CourseExit />
-            </TabContainer>
-          </PageRoute>
-          <PageRoute
-            path={[
-              '/course/:courseId/:sequenceId/:unitId',
-              '/course/:courseId/:sequenceId',
-              '/course/:courseId',
-            ]}
-            component={CoursewareContainer}
-          />
+          <Route exact path="/nexblock" component={NexBlockContainer} />
+          <Switch>
+            <Route exact path="/plugin-test" component={PluginTestPage} />
+            <PageRoute path="/redirect" component={CoursewareRedirectLandingPage} />
+            <PageRoute path="/course/:courseId/home">
+              <TabContainer tab="outline" fetch={fetchOutlineTab} slice="courseHome">
+                <OutlineTab />
+              </TabContainer>
+            </PageRoute>
+            <PageRoute path="/course/:courseId/dates">
+              <TabContainer tab="dates" fetch={fetchDatesTab} slice="courseHome">
+                <DatesTab />
+              </TabContainer>
+            </PageRoute>
+            <PageRoute path="/course/:courseId/progress">
+              <TabContainer tab="progress" fetch={fetchProgressTab} slice="courseHome">
+                <ProgressTab />
+              </TabContainer>
+            </PageRoute>
+            <PageRoute path="/course/:courseId/course-end">
+              <TabContainer tab="courseware" fetch={fetchCourse} slice="courseware">
+                <CourseExit />
+              </TabContainer>
+            </PageRoute>
+            <PageRoute
+              path={[
+                '/course/:courseId/:sequenceId/:unitId',
+                '/course/:courseId/:sequenceId',
+                '/course/:courseId',
+              ]}
+              component={CoursewareContainer}
+            />
+          </Switch>
+          <Footer />
         </Switch>
-        <Footer />
       </UserMessagesProvider>
     </AppProvider>,
     document.getElementById('root'),
diff --git a/src/plugin-test/NexBlockPage.jsx b/src/nexblocks/NexBlockContainer.jsx
similarity index 84%
rename from src/plugin-test/NexBlockPage.jsx
rename to src/nexblocks/NexBlockContainer.jsx
index 2f1c0217..59dc7410 100644
--- a/src/plugin-test/NexBlockPage.jsx
+++ b/src/nexblocks/NexBlockContainer.jsx
@@ -1,12 +1,12 @@
 import React, { Component } from 'react';
 
-import Plugin, { COMPONENT } from './Plugin';
+import Plugin, { COMPONENT } from '../plugin-test/Plugin';
 
 const FALLBACK_URL = 'http://localhost:7331/remoteEntry.js';
 const FALLBACK_VIEW = 'PluginOne';
 
 // eslint-disable-next-line react/prefer-stateless-function
-export default class NexBlockPage extends Component {
+export default class NexBlockContainer extends Component {
   render() {
     // eslint-disable-next-line react/prop-types
     const query = new URLSearchParams(this.props.location.search);