diff --git a/src/App.jsx b/src/App.jsx
index d9405be..700c6df 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -3,20 +3,20 @@ import { createTheme, ThemeProvider, CssBaseline } from '@mui/material';
 import { AuthProvider } from './context/AuthContext';
 import PrivateRoute from './components/PrivateRoute';
 import Layout from './components/Layout';
-import LoginPage from './pages/LoginPage';
-import RegisterPage from './pages/RegisterPage';
-import UsersPage from './pages/UsersPage';
-import PostsPage from './pages/PostsPage';
-import CreateNewsPage from './pages/CreateNewsPage';
-import OrganizationPage from './pages/OrganizationPage';
-import PushPage from './pages/PushPage';
-import EditAttractionPage from './pages/EditAttractionPage';
-import AttractionPage from './pages/AttractionPage';
-import HomePage from './pages/HomePage';
-import EditOrganizationPage from "./pages/EditOrganizationPage.jsx";
-import CompanyPage from "./pages/CompanyPage.jsx";
-import EditCompanyPage from "./pages/EditCompanyPage.jsx";
-import CalenderPostPage from "./pages/CalenderPostPage.jsx";
+import LoginPage from './pages/Auth/LoginPage.jsx';
+import RegisterPage from './pages/Auth/RegisterPage.jsx';
+import UsersPage from './pages/Auth/UsersPage.jsx';
+import PostsPage from './pages/News/PostsPage.jsx';
+import CreateNewsPage from './pages/News/CreateNewsPage.jsx';
+import OrganizationPage from './pages/Organization/OrganizationPage.jsx';
+import PushPage from './pages/Notification/PushPage.jsx';
+import EditAttractionPage from './pages/Attraction/EditAttractionPage.jsx';
+import AttractionPage from './pages/Attraction/AttractionPage.jsx';
+import HomePage from './pages/Home/HomePage.jsx';
+import EditOrganizationPage from "./pages/Organization/EditOrganizationPage.jsx";
+import CompanyPage from "./pages/Company/CompanyPage.jsx";
+import EditCompanyPage from "./pages/Company/EditCompanyPage.jsx";
+import CalenderPostPage from "./pages/Calender/CalenderPostPage.jsx";
 
 const theme = createTheme({
   palette: {
diff --git a/src/pages/AttractionPage.jsx b/src/pages/Attraction/AttractionPage.jsx
similarity index 99%
rename from src/pages/AttractionPage.jsx
rename to src/pages/Attraction/AttractionPage.jsx
index be82f88..6cb099c 100644
--- a/src/pages/AttractionPage.jsx
+++ b/src/pages/Attraction/AttractionPage.jsx
@@ -8,7 +8,7 @@ import { DataGrid } from '@mui/x-data-grid';
 import DeleteOutlineIcon from '@mui/icons-material/DeleteOutline';
 import AddIcon from '@mui/icons-material/Add';
 import { Chip } from '@mui/material';
-import axiosInstance from '../api/axiosInstance';
+import axiosInstance from '../../api/axiosInstance.js';
 import EditOutlinedIcon from "@mui/icons-material/EditOutlined";
 import {useNavigate} from "react-router-dom";
 
diff --git a/src/pages/EditAttractionPage.jsx b/src/pages/Attraction/EditAttractionPage.jsx
similarity index 98%
rename from src/pages/EditAttractionPage.jsx
rename to src/pages/Attraction/EditAttractionPage.jsx
index 5f635f4..97b8dc0 100644
--- a/src/pages/EditAttractionPage.jsx
+++ b/src/pages/Attraction/EditAttractionPage.jsx
@@ -16,7 +16,7 @@ import ArrowBackIcon from "@mui/icons-material/ArrowBack";
 import StarIcon from "@mui/icons-material/Star";
 import DeleteOutlineIcon from "@mui/icons-material/DeleteOutline";
 import AddPhotoAlternateOutlinedIcon from "@mui/icons-material/AddPhotoAlternateOutlined";
-import axiosInstance from "../api/axiosInstance.js";
+import axiosInstance from "../../api/axiosInstance.js";
 
 const EMPTY_FORM = {
     description: '',
@@ -242,7 +242,7 @@ export default function EditAttractionPage() {
                                                 sx={{ mt: 0.5, px: 0, minWidth: 0, fontSize: 12 }}
                                             >
                                                 Bild ersetzen
-                                                <input type="file" hidden accept="image/*" onChange={handleTitleImageChange} />
+                                                <input type="file" hidden accept="image/jpeg,image/png,image/webp" onChange={handleTitleImageChange} />
                                             </Button>
                                         </Box>
                                         <IconButton size="small" color="error" onClick={handleRemoveTitleImage}>
@@ -258,7 +258,7 @@ export default function EditAttractionPage() {
                                         sx={{ alignSelf: 'flex-start' }}
                                     >
                                         Titelbild hochladen
-                                        <input type="file" hidden accept="image/*" onChange={handleTitleImageChange} />
+                                        <input type="file" hidden accept="image/jpeg,image/png,image/webp" onChange={handleTitleImageChange} />
                                     </Button>
                                 )}
                             </Box>
@@ -329,7 +329,7 @@ export default function EditAttractionPage() {
                                         sx={{ alignSelf: 'flex-start' }}
                                     >
                                         Bild hinzufügen
-                                        <input type="file" hidden accept="image/*" multiple onChange={handleOtherFilesChange} />
+                                        <input type="file" hidden accept="image/jpeg,image/png,image/webp" multiple onChange={handleOtherFilesChange} />
                                     </Button>
                                 </Stack>
                             </Box>
diff --git a/src/pages/LoginPage.jsx b/src/pages/Auth/LoginPage.jsx
similarity index 98%
rename from src/pages/LoginPage.jsx
rename to src/pages/Auth/LoginPage.jsx
index b305ce9..5568853 100644
--- a/src/pages/LoginPage.jsx
+++ b/src/pages/Auth/LoginPage.jsx
@@ -5,7 +5,7 @@ import {
   Divider, Link,
 } from '@mui/material';
 import LockOutlinedIcon from '@mui/icons-material/LockOutlined';
-import { useAuth } from '../context/AuthContext';
+import { useAuth } from '../../context/AuthContext.jsx';
 
 export default function LoginPage() {
   const { login } = useAuth();
diff --git a/src/pages/RegisterPage.jsx b/src/pages/Auth/RegisterPage.jsx
similarity index 98%
rename from src/pages/RegisterPage.jsx
rename to src/pages/Auth/RegisterPage.jsx
index e928fd5..4d2fd81 100644
--- a/src/pages/RegisterPage.jsx
+++ b/src/pages/Auth/RegisterPage.jsx
@@ -5,7 +5,7 @@ import {
   Alert, CircularProgress, Link, Divider,
 } from '@mui/material';
 import PersonAddOutlinedIcon from '@mui/icons-material/PersonAddOutlined';
-import axiosInstance from '../api/axiosInstance';
+import axiosInstance from '../../api/axiosInstance.js';
 
 export default function RegisterPage() {
   const navigate = useNavigate();
diff --git a/src/pages/UsersPage.jsx b/src/pages/Auth/UsersPage.jsx
similarity index 99%
rename from src/pages/UsersPage.jsx
rename to src/pages/Auth/UsersPage.jsx
index f007660..2e8b252 100644
--- a/src/pages/UsersPage.jsx
+++ b/src/pages/Auth/UsersPage.jsx
@@ -9,7 +9,7 @@ import { DataGrid } from '@mui/x-data-grid';
 import EditOutlinedIcon from '@mui/icons-material/EditOutlined';
 import LockResetIcon from '@mui/icons-material/LockReset';
 import DeleteOutlineIcon from '@mui/icons-material/DeleteOutline';
-import axiosInstance from '../api/axiosInstance';
+import axiosInstance from '../../api/axiosInstance.js';
 
 export default function UsersPage() {
   const [rows, setRows] = useState([]);
diff --git a/src/pages/CalenderPostPage.jsx b/src/pages/Calender/CalenderPostPage.jsx
similarity index 99%
rename from src/pages/CalenderPostPage.jsx
rename to src/pages/Calender/CalenderPostPage.jsx
index f4a2a45..2e3af7d 100644
--- a/src/pages/CalenderPostPage.jsx
+++ b/src/pages/Calender/CalenderPostPage.jsx
@@ -8,7 +8,7 @@ import { DataGrid } from '@mui/x-data-grid';
 import DeleteOutlineIcon from '@mui/icons-material/DeleteOutline';
 import EditIcon from '@mui/icons-material/Edit';
 import AddIcon from '@mui/icons-material/Add';
-import axiosInstance from '../api/axiosInstance';
+import axiosInstance from '../../api/axiosInstance.js';
 
 const emptyForm = {
     title: '',
diff --git a/src/pages/CompanyPage.jsx b/src/pages/Company/CompanyPage.jsx
similarity index 99%
rename from src/pages/CompanyPage.jsx
rename to src/pages/Company/CompanyPage.jsx
index d01370e..03bddca 100644
--- a/src/pages/CompanyPage.jsx
+++ b/src/pages/Company/CompanyPage.jsx
@@ -8,7 +8,7 @@ import { DataGrid } from '@mui/x-data-grid';
 import DeleteOutlineIcon from '@mui/icons-material/DeleteOutline';
 import AddIcon from '@mui/icons-material/Add';
 import { Chip } from '@mui/material';
-import axiosInstance from '../api/axiosInstance';
+import axiosInstance from '../../api/axiosInstance.js';
 import EditOutlinedIcon from "@mui/icons-material/EditOutlined";
 import {useNavigate} from "react-router-dom";
 
diff --git a/src/pages/EditCompanyPage.jsx b/src/pages/Company/EditCompanyPage.jsx
similarity index 98%
rename from src/pages/EditCompanyPage.jsx
rename to src/pages/Company/EditCompanyPage.jsx
index 68bca8f..2e55117 100644
--- a/src/pages/EditCompanyPage.jsx
+++ b/src/pages/Company/EditCompanyPage.jsx
@@ -18,7 +18,7 @@ import DeleteOutlineIcon from "@mui/icons-material/DeleteOutline";
 import AddPhotoAlternateOutlinedIcon from "@mui/icons-material/AddPhotoAlternateOutlined";
 import { useParams } from "react-router-dom";
 import { useEffect } from "react";
-import axiosInstance from "../api/axiosInstance.js";
+import axiosInstance from "../../api/axiosInstance.js";
 
 const EMPTY_FORM = {
     description: '',
@@ -231,7 +231,7 @@ export default function EditCompanyPage() {
                                                 sx={{ mt: 0.5, px: 0, minWidth: 0, fontSize: 12 }}
                                             >
                                                 Bild ersetzen
-                                                <input type="file" hidden accept="image/*" onChange={handleTitleImageChange} />
+                                                <input type="file" hidden accept="image/jpeg,image/png,image/webp" onChange={handleTitleImageChange} />
                                             </Button>
                                         </Box>
                                         <IconButton size="small" color="error" onClick={handleRemoveTitleImage}>
@@ -247,7 +247,7 @@ export default function EditCompanyPage() {
                                         sx={{ alignSelf: 'flex-start' }}
                                     >
                                         Titelbild hochladen
-                                        <input type="file" hidden accept="image/*" onChange={handleTitleImageChange} />
+                                        <input type="file" hidden accept="image/jpeg,image/png,image/webp" onChange={handleTitleImageChange} />
                                     </Button>
                                 )}
                             </Box>
@@ -320,7 +320,7 @@ export default function EditCompanyPage() {
                                         sx={{ alignSelf: 'flex-start' }}
                                     >
                                         Bild hinzufügen
-                                        <input type="file" hidden accept="image/*" multiple onChange={handleOtherFilesChange} />
+                                        <input type="file" hidden accept="image/jpeg,image/png,image/webp" multiple onChange={handleOtherFilesChange} />
                                     </Button>
                                 </Stack>
                             </Box>
diff --git a/src/pages/HomePage.jsx b/src/pages/Home/HomePage.jsx
similarity index 100%
rename from src/pages/HomePage.jsx
rename to src/pages/Home/HomePage.jsx
diff --git a/src/pages/CreateNewsPage.jsx b/src/pages/News/CreateNewsPage.jsx
similarity index 97%
rename from src/pages/CreateNewsPage.jsx
rename to src/pages/News/CreateNewsPage.jsx
index d0ad34d..1e7a009 100644
--- a/src/pages/CreateNewsPage.jsx
+++ b/src/pages/News/CreateNewsPage.jsx
@@ -11,7 +11,7 @@ import AddPhotoAlternateOutlinedIcon from '@mui/icons-material/AddPhotoAlternate
 import NotificationsActiveIcon from '@mui/icons-material/NotificationsActive';
 import NotificationsOffOutlinedIcon from '@mui/icons-material/NotificationsOffOutlined';
 import StarIcon from '@mui/icons-material/Star';
-import axiosInstance from '../api/axiosInstance';
+import axiosInstance from '../../api/axiosInstance.js';
 
 const EMPTY_FORM = {
   title: '',
@@ -156,7 +156,7 @@ export default function CreateNewsPage() {
                     sx={{ alignSelf: 'flex-start' }}
                   >
                     {files.length === 0 ? 'Vorschaubild hinzufügen' : 'Weiteres Bild hinzufügen'}
-                    <input type="file" hidden accept="image/*" multiple onChange={handleFileChange} />
+                    <input type="file" hidden accept="image/jpeg,image/png,image/webp" multiple onChange={handleFileChange} />
                   </Button>
                 </Stack>
               </Box>
diff --git a/src/pages/PostsPage.jsx b/src/pages/News/PostsPage.jsx
similarity index 99%
rename from src/pages/PostsPage.jsx
rename to src/pages/News/PostsPage.jsx
index e201811..19d9bc8 100644
--- a/src/pages/PostsPage.jsx
+++ b/src/pages/News/PostsPage.jsx
@@ -8,7 +8,7 @@ import { DataGrid } from '@mui/x-data-grid';
 import DeleteOutlineIcon from '@mui/icons-material/DeleteOutline';
 import AddIcon from '@mui/icons-material/Add';
 import { useNavigate } from 'react-router-dom';
-import axiosInstance from '../api/axiosInstance';
+import axiosInstance from '../../api/axiosInstance.js';
 
 export default function PostsPage() {
   const [rows, setRows] = useState([]);
diff --git a/src/pages/PushPage.jsx b/src/pages/Notification/PushPage.jsx
similarity index 98%
rename from src/pages/PushPage.jsx
rename to src/pages/Notification/PushPage.jsx
index 3e9fc2d..e75efa4 100644
--- a/src/pages/PushPage.jsx
+++ b/src/pages/Notification/PushPage.jsx
@@ -4,7 +4,7 @@ import {
   Alert, CircularProgress, FormControl, InputLabel, Select, MenuItem,
 } from '@mui/material';
 import SendIcon from '@mui/icons-material/Send';
-import axiosInstance from '../api/axiosInstance';
+import axiosInstance from '../../api/axiosInstance.js';
 
 export default function PushPage() {
   const [title, setTitle] = useState('');
diff --git a/src/pages/EditOrganizationPage.jsx b/src/pages/Organization/EditOrganizationPage.jsx
similarity index 98%
rename from src/pages/EditOrganizationPage.jsx
rename to src/pages/Organization/EditOrganizationPage.jsx
index c0e1b68..00f2de4 100644
--- a/src/pages/EditOrganizationPage.jsx
+++ b/src/pages/Organization/EditOrganizationPage.jsx
@@ -18,7 +18,7 @@ import DeleteOutlineIcon from "@mui/icons-material/DeleteOutline";
 import AddPhotoAlternateOutlinedIcon from "@mui/icons-material/AddPhotoAlternateOutlined";
 import { useParams } from "react-router-dom";
 import { useEffect } from "react";
-import axiosInstance from "../api/axiosInstance.js";
+import axiosInstance from "../../api/axiosInstance.js";
 
 const EMPTY_FORM = {
     description: '',
@@ -231,7 +231,7 @@ export default function EditOrganizationPage() {
                                                 sx={{ mt: 0.5, px: 0, minWidth: 0, fontSize: 12 }}
                                             >
                                                 Bild ersetzen
-                                                <input type="file" hidden accept="image/*" onChange={handleTitleImageChange} />
+                                                <input type="file" hidden accept="image/jpeg,image/png,image/webp" onChange={handleTitleImageChange} />
                                             </Button>
                                         </Box>
                                         <IconButton size="small" color="error" onClick={handleRemoveTitleImage}>
@@ -247,7 +247,7 @@ export default function EditOrganizationPage() {
                                         sx={{ alignSelf: 'flex-start' }}
                                     >
                                         Titelbild hochladen
-                                        <input type="file" hidden accept="image/*" onChange={handleTitleImageChange} />
+                                        <input type="file" hidden accept="image/jpeg,image/png,image/webp" onChange={handleTitleImageChange} />
                                     </Button>
                                 )}
                             </Box>
diff --git a/src/pages/OrganizationPage.jsx b/src/pages/Organization/OrganizationPage.jsx
similarity index 99%
rename from src/pages/OrganizationPage.jsx
rename to src/pages/Organization/OrganizationPage.jsx
index 6354d85..b32708e 100644
--- a/src/pages/OrganizationPage.jsx
+++ b/src/pages/Organization/OrganizationPage.jsx
@@ -8,7 +8,7 @@ import { DataGrid } from '@mui/x-data-grid';
 import DeleteOutlineIcon from '@mui/icons-material/DeleteOutline';
 import AddIcon from '@mui/icons-material/Add';
 import { Chip } from '@mui/material';
-import axiosInstance from '../api/axiosInstance';
+import axiosInstance from '../../api/axiosInstance.js';
 import EditOutlinedIcon from "@mui/icons-material/EditOutlined";
 import {useNavigate} from "react-router-dom";