diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 0000000000000000000000000000000000000000..a7bef6148325253c5450441870c9f37db778bc80
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,15 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "chrome",
+            "request": "launch",
+            "name": "Launch Chrome against localhost",
+            "url": "http://localhost:3000",
+            "webRoot": "${workspaceFolder}/src"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/my-app/src/App.js b/my-app/src/App.js
index 5c881cf7a07a5e74d8c2c1e7208ca8d8ff058097..42c8a219098d158c8af97d353e0914c3cbec1e7a 100644
--- a/my-app/src/App.js
+++ b/my-app/src/App.js
@@ -1,12 +1,12 @@
 import React, { Component } from 'react';
 import './App.css';
-import TopMenu from './components/TopMenu';
-import PublicPage from './components/PublicPage';
-import PrivatePage from './components/PrivatePage';
-import UserManagement from './components/UserComponents/UserManagement';
-import DegreeCourseManagement from './components/DegreeCourseComponents/DegreeCourseManagement';
-import CreateNewUserForm from './components/UserComponents/CreateNewUser';
-import DegreeCourseApplicationManagement from './components/ApplicationComponents/DegreeCourseApplicationManagement'
+import TopMenu from './react/entity/TopMenu';
+import PublicPage from './react/pages/PublicPage';
+import PrivatePage from './react/pages/PrivatePage';
+import UserManagement from '../src/react/user/UserManagement';
+import DegreeCourseManagement from '../src/react/degreeCourse/DegreeCourseManagement';
+import CreateNewUserForm from '../src/react/user/components/CreateNewUser';
+import DegreeCourseApplicationManagement from '../src/react/degreeCourseApplication/DegreeCourseApplicationManagement'
 import { connect } from 'react-redux';
 import { Routes, Route, Navigate } from 'react-router-dom';
 
diff --git a/my-app/src/actions/AuthenticationActions.js b/my-app/src/react/authentication/state/AuthenticationActions.js
similarity index 100%
rename from my-app/src/actions/AuthenticationActions.js
rename to my-app/src/react/authentication/state/AuthenticationActions.js
diff --git a/my-app/src/reducer/AuthenticationReducer.js b/my-app/src/react/authentication/state/AuthenticationReducer.js
similarity index 95%
rename from my-app/src/reducer/AuthenticationReducer.js
rename to my-app/src/react/authentication/state/AuthenticationReducer.js
index ed145dd5808da76470011a7982ef3b78bfe8845a..ba4d2d08a73ad454e5c9b7b3c02fe9ab41f01854 100644
--- a/my-app/src/reducer/AuthenticationReducer.js
+++ b/my-app/src/react/authentication/state/AuthenticationReducer.js
@@ -1,4 +1,4 @@
-import * as authenticationActions from '../actions/AuthenticationActions'
+import * as authenticationActions from './AuthenticationActions'
 
 const initialState = {
     user: null,
diff --git a/my-app/src/components/DegreeCourseComponents/DegreeCourseManagement.js b/my-app/src/react/degreeCourse/DegreeCourseManagement.js
similarity index 93%
rename from my-app/src/components/DegreeCourseComponents/DegreeCourseManagement.js
rename to my-app/src/react/degreeCourse/DegreeCourseManagement.js
index 0d40bd06e3f6cf92d0f758f16d6bfdfd060fb75a..2a5084732f230ec72efb7bd73af8efc342cfbfcd 100644
--- a/my-app/src/components/DegreeCourseComponents/DegreeCourseManagement.js
+++ b/my-app/src/react/degreeCourse/DegreeCourseManagement.js
@@ -1,15 +1,15 @@
 import React, { Component } from "react";
-import DegreeCourseItem from "./DegreeCourseItem";
-import DeleteDegreeCourseModal from './DeleteDegreeCourseModal'
-import EditDegreeCourse from './EditDegreeCourse'
-import CreateNewDegreeCourse from './CreateNewDegreeCourse'
-import CreateNewApplication from '../ApplicationComponents/CreateNewApplication'
+import DegreeCourseItem from "./components/DegreeCourseItem";
+import DeleteDegreeCourseModal from './components/DeleteDegreeCourseModal'
+import EditDegreeCourse from './components/EditDegreeCourse'
+import CreateNewDegreeCourse from './components/CreateNewDegreeCourse'
+import CreateNewApplication from '../degreeCourseApplication/components/CreateNewApplication'
 import addIcon from '../../icons/addIcon.png'
 import Button from "react-bootstrap/esm/Button";
 import { connect } from "react-redux";
 import { bindActionCreators } from "redux";
 
-import * as degreeCourseManagementActions from '../../actions/DegreeCourseManagementActions'
+import * as degreeCourseManagementActions from './state/DegreeCourseManagementActions'
 
 const mapStateToProps = state => {
     return {
diff --git a/my-app/src/components/DegreeCourseComponents/CreateNewDegreeCourse.js b/my-app/src/react/degreeCourse/components/CreateNewDegreeCourse.js
similarity index 98%
rename from my-app/src/components/DegreeCourseComponents/CreateNewDegreeCourse.js
rename to my-app/src/react/degreeCourse/components/CreateNewDegreeCourse.js
index 2f97947d27c8051659b68e21c5fecd32138f038d..ec4418068f356b2eed28ff6520afc155c8e4e5ed 100644
--- a/my-app/src/components/DegreeCourseComponents/CreateNewDegreeCourse.js
+++ b/my-app/src/react/degreeCourse/components/CreateNewDegreeCourse.js
@@ -4,7 +4,7 @@ import Button from "react-bootstrap/esm/Button";
 
 import { connect } from "react-redux";
 import { bindActionCreators } from "redux";
-import * as degreeCourseManagementActions from "../../actions/DegreeCourseManagementActions"
+import * as degreeCourseManagementActions from "../state/DegreeCourseManagementActions"
 
 const mapStateToProps = state => {
     return {
diff --git a/my-app/src/components/DegreeCourseComponents/DegreeCourseItem.js b/my-app/src/react/degreeCourse/components/DegreeCourseItem.js
similarity index 100%
rename from my-app/src/components/DegreeCourseComponents/DegreeCourseItem.js
rename to my-app/src/react/degreeCourse/components/DegreeCourseItem.js
diff --git a/my-app/src/components/DegreeCourseComponents/DeleteDegreeCourseModal.js b/my-app/src/react/degreeCourse/components/DeleteDegreeCourseModal.js
similarity index 92%
rename from my-app/src/components/DegreeCourseComponents/DeleteDegreeCourseModal.js
rename to my-app/src/react/degreeCourse/components/DeleteDegreeCourseModal.js
index 1992bf778547b80284ffe57ffbde6bb8a1ff99a8..4b8c61c2bbbad704b618e7d24a104bae59909954 100644
--- a/my-app/src/components/DegreeCourseComponents/DeleteDegreeCourseModal.js
+++ b/my-app/src/react/degreeCourse/components/DeleteDegreeCourseModal.js
@@ -4,7 +4,7 @@ import Modal from 'react-bootstrap/Modal';
 import { connect } from "react-redux";
 import { bindActionCreators } from "redux";
 
-import * as degreeCoursemanagementActions from '../../actions/DegreeCourseManagementActions'
+import * as degreeCourseManagementActions from "../state/DegreeCourseManagementActions"
 
 const mapStateToProps = state => {
     return {
@@ -73,8 +73,8 @@ class DeleteDegreeCourseModal extends Component {
 
 
 const mapDispatchToProps = dispatch => bindActionCreators({
-    hideDeleteDegreeCourseModalAction: degreeCoursemanagementActions.getHideDeleteDegreeCourseModalAction,
-    pushDeleteDegreeCourseModalAction: degreeCoursemanagementActions.deleteDegreeCourseWithID
+    hideDeleteDegreeCourseModalAction: degreeCourseManagementActions.getHideDeleteDegreeCourseModalAction,
+    pushDeleteDegreeCourseModalAction: degreeCourseManagementActions.deleteDegreeCourseWithID
 }, dispatch)
 
 const ConnectedDeleteDegreeCourseModal = connect(mapStateToProps, mapDispatchToProps)(DeleteDegreeCourseModal)
diff --git a/my-app/src/components/DegreeCourseComponents/EditDegreeCourse.js b/my-app/src/react/degreeCourse/components/EditDegreeCourse.js
similarity index 98%
rename from my-app/src/components/DegreeCourseComponents/EditDegreeCourse.js
rename to my-app/src/react/degreeCourse/components/EditDegreeCourse.js
index 8b62fb864db6ad62e3900b2ced4b0852feccfb3b..cf60f1754911b8d475329869771230c73d46f497 100644
--- a/my-app/src/components/DegreeCourseComponents/EditDegreeCourse.js
+++ b/my-app/src/react/degreeCourse/components/EditDegreeCourse.js
@@ -4,7 +4,7 @@ import Form from 'react-bootstrap/Form';
 import { connect } from "react-redux";
 import { bindActionCreators } from "redux";
 
-import * as degreeCourseManagementActions from '../../actions/DegreeCourseManagementActions'
+import * as degreeCourseManagementActions from "../state/DegreeCourseManagementActions"
 
 const mapStateToProps = state => {
     return {
diff --git a/my-app/src/actions/DegreeCourseManagementActions.js b/my-app/src/react/degreeCourse/state/DegreeCourseManagementActions.js
similarity index 100%
rename from my-app/src/actions/DegreeCourseManagementActions.js
rename to my-app/src/react/degreeCourse/state/DegreeCourseManagementActions.js
diff --git a/my-app/src/reducer/DegreeCourseManagementReducer.js b/my-app/src/react/degreeCourse/state/DegreeCourseManagementReducer.js
similarity index 96%
rename from my-app/src/reducer/DegreeCourseManagementReducer.js
rename to my-app/src/react/degreeCourse/state/DegreeCourseManagementReducer.js
index 2c2dabb7a4a46f71f82ab87578233c307b6d8241..ffdbb1ed07c20d789d74c798982457911b1198c0 100644
--- a/my-app/src/reducer/DegreeCourseManagementReducer.js
+++ b/my-app/src/react/degreeCourse/state/DegreeCourseManagementReducer.js
@@ -1,4 +1,4 @@
-import * as degreeCourseManagementActions from "../actions/DegreeCourseManagementActions"
+import * as degreeCourseManagementActions from "./DegreeCourseManagementActions"
 
 const initialState = {
     showDeleteDegreeCourseModal: false,
diff --git a/my-app/src/components/ApplicationComponents/DegreeCourseApplicationManagement.js b/my-app/src/react/degreeCourseApplication/DegreeCourseApplicationManagement.js
similarity index 92%
rename from my-app/src/components/ApplicationComponents/DegreeCourseApplicationManagement.js
rename to my-app/src/react/degreeCourseApplication/DegreeCourseApplicationManagement.js
index 600684bde154cac1a29967c48ad24b8a04c960e3..511c1914e9a4071219602352665cea95fa505fd9 100644
--- a/my-app/src/components/ApplicationComponents/DegreeCourseApplicationManagement.js
+++ b/my-app/src/react/degreeCourseApplication/DegreeCourseApplicationManagement.js
@@ -1,10 +1,10 @@
 import React, { Component } from "react";
-import ApplicationItem from "./ApplicationItem";
-import DeleteApplicationModal from './DeleteApplicationModal'
+import ApplicationItem from "./components/ApplicationItem";
+import DeleteApplicationModal from './components/DeleteApplicationModal'
 import { connect } from "react-redux";
 import { bindActionCreators } from "redux";
 
-import * as applicationManagementActions from '../../actions/ApplicationManagementActions'
+import * as applicationManagementActions from './state/ApplicationManagementActions'
 
 const mapStateToProps = state => {
     return {
diff --git a/my-app/src/components/ApplicationComponents/ApplicationItem.js b/my-app/src/react/degreeCourseApplication/components/ApplicationItem.js
similarity index 100%
rename from my-app/src/components/ApplicationComponents/ApplicationItem.js
rename to my-app/src/react/degreeCourseApplication/components/ApplicationItem.js
diff --git a/my-app/src/components/ApplicationComponents/CreateNewApplication.js b/my-app/src/react/degreeCourseApplication/components/CreateNewApplication.js
similarity index 98%
rename from my-app/src/components/ApplicationComponents/CreateNewApplication.js
rename to my-app/src/react/degreeCourseApplication/components/CreateNewApplication.js
index 2b7da2203cd65f773fdc18e88c4ce0ff3ca72dc8..b493f6a120756cdc2abe80f8594dcf7865a6a176 100644
--- a/my-app/src/components/ApplicationComponents/CreateNewApplication.js
+++ b/my-app/src/react/degreeCourseApplication/components/CreateNewApplication.js
@@ -5,7 +5,7 @@ import Button from "react-bootstrap/esm/Button";
 import { connect } from "react-redux";
 import { bindActionCreators } from "redux";
 
-import * as applicationManagementActions from "../../actions/ApplicationManagementActions"
+import * as applicationManagementActions from "../state/ApplicationManagementActions"
 
 const mapStateToProps = state => {
     return {
diff --git a/my-app/src/components/ApplicationComponents/DeleteApplicationModal.js b/my-app/src/react/degreeCourseApplication/components/DeleteApplicationModal.js
similarity index 97%
rename from my-app/src/components/ApplicationComponents/DeleteApplicationModal.js
rename to my-app/src/react/degreeCourseApplication/components/DeleteApplicationModal.js
index cb171f9327c49b24ed417a827af0a27bf80e3728..b97c595af50217674319f7d8bfd937dd20caf900 100644
--- a/my-app/src/components/ApplicationComponents/DeleteApplicationModal.js
+++ b/my-app/src/react/degreeCourseApplication/components/DeleteApplicationModal.js
@@ -4,7 +4,7 @@ import Modal from 'react-bootstrap/Modal';
 import { connect } from "react-redux";
 import { bindActionCreators } from "redux";
 
-import * as applicationmanagementActions from '../../actions/ApplicationManagementActions'
+import * as applicationmanagementActions from '../state/ApplicationManagementActions'
 
 const mapStateToProps = state => {
     return {
diff --git a/my-app/src/actions/ApplicationManagementActions.js b/my-app/src/react/degreeCourseApplication/state/ApplicationManagementActions.js
similarity index 100%
rename from my-app/src/actions/ApplicationManagementActions.js
rename to my-app/src/react/degreeCourseApplication/state/ApplicationManagementActions.js
diff --git a/my-app/src/reducer/DegreeCourseApplicationReducer.js b/my-app/src/react/degreeCourseApplication/state/DegreeCourseApplicationReducer.js
similarity index 96%
rename from my-app/src/reducer/DegreeCourseApplicationReducer.js
rename to my-app/src/react/degreeCourseApplication/state/DegreeCourseApplicationReducer.js
index 0ba20845912688781dd3565f49ad32b4c0e21cd5..f0a09418f56c100856f72fd16960549dccb18057 100644
--- a/my-app/src/reducer/DegreeCourseApplicationReducer.js
+++ b/my-app/src/react/degreeCourseApplication/state/DegreeCourseApplicationReducer.js
@@ -1,4 +1,4 @@
-import * as applicationManagementActions from "../actions/ApplicationManagementActions"
+import * as applicationManagementActions from "./ApplicationManagementActions"
 
 const initialState = {
     showDeleteApplicationModal: false,
diff --git a/my-app/src/components/TopMenu.js b/my-app/src/react/entity/TopMenu.js
similarity index 91%
rename from my-app/src/components/TopMenu.js
rename to my-app/src/react/entity/TopMenu.js
index c1362d4694b1e2fdb0298eb12389d06e90ffe6e2..21d7b54fedac54a07827c4d641036b7cd339ba69 100644
--- a/my-app/src/components/TopMenu.js
+++ b/my-app/src/react/entity/TopMenu.js
@@ -1,15 +1,15 @@
 import React, { Component } from "react";
 import Nav from 'react-bootstrap/Nav';
 import Navbar from 'react-bootstrap/Navbar';
-import UserSessionWidget from "./UserComponents/userSessionWidget";
+import UserSessionWidget from "../user/components/userSessionWidget";
 import Container from 'react-bootstrap/Container';
 import { LinkContainer } from 'react-router-bootstrap';
 import { connect } from "react-redux";
 import { bindActionCreators } from "redux";
-import * as authenticationActions from '../actions/AuthenticationActions'
-import * as userManagementActions from '../actions/UserManagementActions';
-import * as degreeCourseManagementActions from '../actions/DegreeCourseManagementActions';
-import * as applicationManagementActions from '../actions/ApplicationManagementActions';
+import * as authenticationActions from '../authentication/state/AuthenticationActions'
+import * as userManagementActions from '../user/state/UserManagementActions';
+import * as degreeCourseManagementActions from '../degreeCourse/state/DegreeCourseManagementActions';
+import * as applicationManagementActions from '../degreeCourseApplication/state/ApplicationManagementActions';
 
 const mapStateToProps = state => {
     return {
diff --git a/my-app/src/components/loginButton.js b/my-app/src/react/entity/loginButton.js
similarity index 88%
rename from my-app/src/components/loginButton.js
rename to my-app/src/react/entity/loginButton.js
index a4e8ef83a43acb63abcea2e4e316493d77fa159b..86bbc626d3205f32aa2f87ead253f2f93c9cf5c2 100644
--- a/my-app/src/components/loginButton.js
+++ b/my-app/src/react/entity/loginButton.js
@@ -3,7 +3,7 @@ import Button from "react-bootstrap/esm/Button";
 
 import { connect } from "react-redux";
 
-import { getShowLoginDialogAction } from "../actions/AuthenticationActions";
+import { getShowLoginDialogAction } from "../authentication/state/AuthenticationActions";
 class loginButton extends Component {
 
     constructor(props) {
diff --git a/my-app/src/components/PrivatePage.js b/my-app/src/react/pages/PrivatePage.js
similarity index 100%
rename from my-app/src/components/PrivatePage.js
rename to my-app/src/react/pages/PrivatePage.js
diff --git a/my-app/src/components/PublicPage.js b/my-app/src/react/pages/PublicPage.js
similarity index 94%
rename from my-app/src/components/PublicPage.js
rename to my-app/src/react/pages/PublicPage.js
index fc83a2d03b9eb84740630cdcfd7365bc12da687c..e19a3493a2ba77c15d8f90b8982e4bf72edea488 100644
--- a/my-app/src/components/PublicPage.js
+++ b/my-app/src/react/pages/PublicPage.js
@@ -1,5 +1,5 @@
 import React, { Component } from "react";
-import LoginButton from "./loginButton";
+import LoginButton from "../entity/loginButton";
 
 class PublicPage extends Component {
     render() {
diff --git a/my-app/src/components/UserComponents/UserManagement.js b/my-app/src/react/user/UserManagement.js
similarity index 94%
rename from my-app/src/components/UserComponents/UserManagement.js
rename to my-app/src/react/user/UserManagement.js
index 5f681fd41452b046eacfadd7860e7186fd02218f..d8c7f684346df1630ee986aba2315a628c77243e 100644
--- a/my-app/src/components/UserComponents/UserManagement.js
+++ b/my-app/src/react/user/UserManagement.js
@@ -1,15 +1,15 @@
 import React, { Component } from "react";
-import UserItem from "./UserItem";
+import UserItem from "./components/UserItem";
 import Button from "react-bootstrap/esm/Button";
 
-import DeleteUserModal from './DeleteUserModal'
-import EditUser from './EditUser'
-import CreateNewUser from './CreateNewUser'
+import DeleteUserModal from './components/DeleteUserModal'
+import EditUser from './components/EditUser'
+import CreateNewUser from './components/CreateNewUser'
 import addIcon from '../../icons/addIcon.png'
 import { connect } from "react-redux";
 import { bindActionCreators } from "redux";
 
-import * as userManagementActions from '../../actions/UserManagementActions'
+import * as userManagementActions from "./state/UserManagementActions"
 
 
 const mapStateToProps = state => {
diff --git a/my-app/src/components/UserComponents/CreateNewUser.js b/my-app/src/react/user/components/CreateNewUser.js
similarity index 98%
rename from my-app/src/components/UserComponents/CreateNewUser.js
rename to my-app/src/react/user/components/CreateNewUser.js
index 43ba67280be5cd01a2212f455462976101a64189..51c5c641c164d38111c36411e78abd33896b9829 100644
--- a/my-app/src/components/UserComponents/CreateNewUser.js
+++ b/my-app/src/react/user/components/CreateNewUser.js
@@ -4,7 +4,7 @@ import Button from "react-bootstrap/esm/Button";
 
 import { connect } from "react-redux";
 import { bindActionCreators } from "redux";
-import * as userManagementActions from "../../actions/UserManagementActions";
+import * as userManagementActions from "../state/UserManagementActions";
 
 const mapStateToProps = state => {
     return {
diff --git a/my-app/src/components/UserComponents/DeleteUserModal.js b/my-app/src/react/user/components/DeleteUserModal.js
similarity index 97%
rename from my-app/src/components/UserComponents/DeleteUserModal.js
rename to my-app/src/react/user/components/DeleteUserModal.js
index fb82c19a68f0c2cd70167e2094f5b3470565ca24..f436fd5c32e21bcc875bab85310bebb9ac549a06 100644
--- a/my-app/src/components/UserComponents/DeleteUserModal.js
+++ b/my-app/src/react/user/components/DeleteUserModal.js
@@ -4,7 +4,7 @@ import Modal from 'react-bootstrap/Modal';
 import { connect } from "react-redux";
 import { bindActionCreators } from "redux";
 
-import * as userManagementActions from '../../actions/UserManagementActions'
+import * as userManagementActions from "../state/UserManagementActions"
 
 const mapStateToProps = state => {
     return {
diff --git a/my-app/src/components/UserComponents/EditUser.js b/my-app/src/react/user/components/EditUser.js
similarity index 98%
rename from my-app/src/components/UserComponents/EditUser.js
rename to my-app/src/react/user/components/EditUser.js
index adedfa33ecfd9de2a272a89caf1fa508e8c0a47e..02884576a6e09af4d7306881e159a12757da7994 100644
--- a/my-app/src/components/UserComponents/EditUser.js
+++ b/my-app/src/react/user/components/EditUser.js
@@ -4,7 +4,7 @@ import Form from 'react-bootstrap/Form';
 import { connect } from "react-redux";
 import { bindActionCreators } from "redux";
 
-import * as userManagementActions from '../../actions/UserManagementActions'
+import * as userManagementActions from "../state/UserManagementActions"
 
 const mapStateToProps = state => {
     return {
diff --git a/my-app/src/components/UserComponents/UserItem.js b/my-app/src/react/user/components/UserItem.js
similarity index 100%
rename from my-app/src/components/UserComponents/UserItem.js
rename to my-app/src/react/user/components/UserItem.js
diff --git a/my-app/src/components/UserComponents/userSessionWidget.js b/my-app/src/react/user/components/userSessionWidget.js
similarity index 97%
rename from my-app/src/components/UserComponents/userSessionWidget.js
rename to my-app/src/react/user/components/userSessionWidget.js
index 4feb78057ba58fa6dbfa5cecccc8b3b77ffa6fd2..8673b67714c4cf3550691a480ad65dafa0355428 100644
--- a/my-app/src/components/UserComponents/userSessionWidget.js
+++ b/my-app/src/react/user/components/userSessionWidget.js
@@ -6,7 +6,7 @@ import React, { Component } from "react";
 import { connect } from "react-redux";
 import { bindActionCreators } from "redux";
 
-import * as authenticationActions from '../../actions/AuthenticationActions'
+import * as authenticationActions from "../../authentication/state/AuthenticationActions"
 
 const mapStateToProps = state => {
     return {
diff --git a/my-app/src/actions/UserManagementActions.js b/my-app/src/react/user/state/UserManagementActions.js
similarity index 100%
rename from my-app/src/actions/UserManagementActions.js
rename to my-app/src/react/user/state/UserManagementActions.js
diff --git a/my-app/src/reducer/UserManagementReducer.js b/my-app/src/react/user/state/UserManagementReducer.js
similarity index 96%
rename from my-app/src/reducer/UserManagementReducer.js
rename to my-app/src/react/user/state/UserManagementReducer.js
index 8bd02927ffc162c557a1ac627ebb8534cca1e5a3..4c8c3cb50fbea8a7f95448a2bf5d1610020890f2 100644
--- a/my-app/src/reducer/UserManagementReducer.js
+++ b/my-app/src/react/user/state/UserManagementReducer.js
@@ -1,4 +1,4 @@
-import * as userManagementActions from '../actions/UserManagementActions'
+import * as userManagementActions from './UserManagementActions'
 
 const initialState = {
     showDeleteUserModal: false,
diff --git a/my-app/src/reducer/RootReducer.js b/my-app/src/reducer/RootReducer.js
index 229e50a66402935072340e8884747c446d449af0..066d1a26701cfacde0365d8788e9a7a96c5dba23 100644
--- a/my-app/src/reducer/RootReducer.js
+++ b/my-app/src/reducer/RootReducer.js
@@ -1,8 +1,8 @@
 import { combineReducers } from "redux";
-import UserManagementReducer from "./UserManagementReducer";
-import DegreeCourseReducer from "./DegreeCourseManagementReducer";
-import AuthenticationReducer from "./AuthenticationReducer";
-import DegreeCourseApplicationReducer from "./DegreeCourseApplicationReducer";
+import UserManagementReducer from "../react/user/state/UserManagementReducer";
+import DegreeCourseReducer from "../react/degreeCourse/state/DegreeCourseManagementReducer";
+import AuthenticationReducer from "../react/authentication/state/AuthenticationReducer";
+import DegreeCourseApplicationReducer from "../react/degreeCourseApplication/state/DegreeCourseApplicationReducer";
 
 const rootReducer = combineReducers({
     UserManagementReducer,