diff --git a/my-app/src/App.js b/my-app/src/App.js
index 42c8a219098d158c8af97d353e0914c3cbec1e7a..d146b4832b6759e08bd5cf1d16473a8cc33cd458 100644
--- a/my-app/src/App.js
+++ b/my-app/src/App.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import './App.css';
-import TopMenu from './react/entity/TopMenu';
+import TopMenu from './react/authentication/components/TopMenu';
 import PublicPage from './react/pages/PublicPage';
 import PrivatePage from './react/pages/PrivatePage';
 import UserManagement from '../src/react/user/UserManagement';
diff --git a/my-app/src/react/entity/TopMenu.js b/my-app/src/react/authentication/components/TopMenu.js
similarity index 91%
rename from my-app/src/react/entity/TopMenu.js
rename to my-app/src/react/authentication/components/TopMenu.js
index 35ff4738d5794323640a187b9a4591b9f27d2791..f75fc45b650f8c157c2999cbc676225edd962d32 100644
--- a/my-app/src/react/entity/TopMenu.js
+++ b/my-app/src/react/authentication/components/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 "../user/components/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 '../authentication/state/AuthenticationActions'
-import * as userManagementActions from '../user/state/UserManagementActions';
-import * as degreeCourseManagementActions from '../degreeCourse/state/DegreeCourseManagementActions';
-import * as applicationManagementActions from '../degreeCourseApplication/state/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/react/entity/loginButton.js b/my-app/src/react/authentication/components/loginButton.js
similarity index 88%
rename from my-app/src/react/entity/loginButton.js
rename to my-app/src/react/authentication/components/loginButton.js
index 86bbc626d3205f32aa2f87ead253f2f93c9cf5c2..3521efe51d02d1a1f069164358ba818802a357f5 100644
--- a/my-app/src/react/entity/loginButton.js
+++ b/my-app/src/react/authentication/components/loginButton.js
@@ -3,7 +3,7 @@ import Button from "react-bootstrap/esm/Button";
 
 import { connect } from "react-redux";
 
-import { getShowLoginDialogAction } from "../authentication/state/AuthenticationActions";
+import { getShowLoginDialogAction } from "../state/AuthenticationActions";
 class loginButton extends Component {
 
     constructor(props) {
diff --git a/my-app/src/react/pages/PublicPage.js b/my-app/src/react/pages/PublicPage.js
index e19a3493a2ba77c15d8f90b8982e4bf72edea488..9fd66e55b7b83179148c14785cc353352ee5e41a 100644
--- a/my-app/src/react/pages/PublicPage.js
+++ b/my-app/src/react/pages/PublicPage.js
@@ -1,5 +1,5 @@
 import React, { Component } from "react";
-import LoginButton from "../entity/loginButton";
+import LoginButton from "../authentication/components/loginButton";
 
 class PublicPage extends Component {
     render() {