diff --git a/server.js b/server.js
index 3a6ea0c..65130ee 100644
--- a/server.js
+++ b/server.js
@@ -1,183 +1,14 @@
 import express from 'express';
-import ICAL from 'ical.js';
-import fs from 'fs';
-import axios from 'axios';
 import path from 'path';
+import routes from './src/routes.js';
 
 const app = express();
 app.use(express.json());
 
-const MERGED_CALENDARS_DIR = path.join(process.cwd(), 'calendar');
-console.log(`Merged calendars directory: ${MERGED_CALENDARS_DIR} under ${process.cwd()}`);
-
-// Ensure the merged calendars directory exists
-fs.mkdirSync(MERGED_CALENDARS_DIR, { recursive: true });
 
 // Serve static files from the 'public' directory
 app.use(express.static(path.join(process.cwd(), 'public')));
+app.use('/', routes);
 
-// Utility to sanitize filenames
-const sanitizeFilename = (filename) => filename.replace(/[<>:"/\\|?* ]/g, '_');
-
-// Fetch calendar data from URL or file
-async function fetchCalendarData(calendar) {
-    const isFilePath = !calendar.url.startsWith('http');
-    try {
-        if (isFilePath) {
-            console.log(`Fetching calendar data from file: ${calendar.url}`);
-            return {
-                data: fs.readFileSync(path.resolve(calendar.url), 'utf-8'),
-                ...calendar
-            };
-        } else {
-            console.log(`Fetching calendar data from URL: ${calendar.url}`);
-            const response = await axios.get(calendar.url);
-            return { data: response.data, ...calendar };
-        }
-    } catch (error) {
-        console.error(`Error retrieving calendar from ${calendar.url}:`, error.message);
-        throw error;
-    }
-}
-
-// Create a top-level VCALENDAR component
-function createCalendarComponent(name) {
-    console.log(`Creating calendar component for: ${name}`);
-    const calendarComponent = new ICAL.Component(['vcalendar', [], []]);
-    calendarComponent.updatePropertyWithValue('prodid', '-//Your Product ID//EN');
-    calendarComponent.updatePropertyWithValue('version', '2.0');
-    calendarComponent.updatePropertyWithValue('name', name); // calendar name
-    return calendarComponent;
-}
-
-// Add events to the calendar component
-function addEventsToCalendar(calendarComponent, results) {
-    console.log(`Adding events to calendar component.`);
-    results.forEach((result) => {
-        // console.log(result.data);
-        const parsed = ICAL.parse(result.data);
-        const component = new ICAL.Component(parsed);
-
-        component.getAllSubcomponents('vevent').forEach((event) => {
-            const vevent = new ICAL.Event(event);
-            const newEvent = new ICAL.Component('vevent');
-
-            console.log(`Adding event: ${vevent.summary} to calendar.`);
-
-            // Get start and end dates directly
-            const startDate = vevent.startDate && ICAL.Time.fromJSDate(vevent.startDate.toJSDate());
-            const endDate = vevent.endDate && ICAL.Time.fromJSDate(vevent.endDate.toJSDate());
-
-            // Log the start and end dates
-            console.log(`Start Date: ${startDate}`);
-            console.log(`End Date: ${endDate}`);
-
-            // // Check if the dates are valid
-            // if (!startDate || !endDate || !startDate.isValid() || !endDate.isValid()) {
-            //     console.warn(`Invalid date for event: ${vevent.summary}`);
-            //     return; // Skip or handle accordingly
-            // }
-
-            newEvent.updatePropertyWithValue('uid', vevent.uid);
-            newEvent.updatePropertyWithValue('summary', result.override ? result.prefix : `${result.prefix} ${vevent.summary}`);
-            newEvent.updatePropertyWithValue('dtstart', startDate);
-            newEvent.updatePropertyWithValue('dtend', endDate);
-
-            calendarComponent.addSubcomponent(newEvent);
-        });
-    });
-}
-
-// Save calendar data to file
-function saveCalendarFile(filename, content) {
-    const filePath = path.join(MERGED_CALENDARS_DIR, filename);
-    console.log(`Saving calendar data to file: ${filePath}`);
-    fs.writeFileSync(filePath, content);
-    return filePath;
-}
-
-// Merge calendars endpoint
-app.post('/merge', async (req, res) => {
-    const { linkGroupName, calendars } = req.body;
-
-    // Validate the input
-    if (!linkGroupName || !Array.isArray(calendars) || calendars.length === 0) {
-        console.warn('Invalid input provided for merge endpoint.');
-        return res.status(400).json({ error: 'Invalid input. Please provide a linkGroupName and at least one calendar.' });
-    }
-
-    try {
-        
-        // Sanitize the linkGroupName to create a valid filename
-        console.log(`Merging calendars for group: ${linkGroupName}`);
-        const sanitizedLinkGroupName = sanitizeFilename(linkGroupName);
-        const filename = `${sanitizedLinkGroupName}.ics`;
-
-        // Fetch calendar data
-        const results = await Promise.all(calendars.map(fetchCalendarData));
-        
-        // Generate merged calendar using ical.js
-        const calendarComponent = createCalendarComponent(linkGroupName);
-        addEventsToCalendar(calendarComponent, results);
-        
-        // Save the calendar to a file
-        saveCalendarFile(filename, calendarComponent.toString());
-
-        // Save the user input and sanitizedLinkGroupName in a separate JSON file
-        saveCalendarFile(`${sanitizedLinkGroupName}.json`, JSON.stringify({ linkGroupName, calendars }, null, 2));
-
-        res.json({ url: `${req.protocol}://${req.get('host')}/calendar/${sanitizedLinkGroupName}` });
-    } catch (error) {
-        console.error('Error merging calendars:', error.message);
-        res.status(500).json({ error: 'Failed to merge calendars' });
-    }
-});
-
-// Refresh calendar if outdated
-async function refreshCalendarData(calendarName) {
-    const jsonFilePath = path.join(MERGED_CALENDARS_DIR, `${calendarName}.json`);
-    console.log(`Refreshing calendar data for: ${calendarName}`);
-
-    // Read the JSON file to get the source URL and other details
-    const { calendars } = JSON.parse(fs.readFileSync(jsonFilePath, 'utf-8'));
-
-    const results = await Promise.all(calendars.map(fetchCalendarData));
-    const calendarComponent = createCalendarComponent(calendarName);
-    addEventsToCalendar(calendarComponent, results);
-
-    saveCalendarFile(`${calendarName}.ics`, calendarComponent.toString());
-    console.log('Calendar data refreshed and saved.');
-}
-
-// Serve the merged calendar file and refresh if older than an hour
-app.get('/calendar/:name', async (req, res) => {
-    const calendarName = req.params.name;
-    const icsFilePath = path.join(MERGED_CALENDARS_DIR, `${calendarName}.ics`);
-
-    try {
-        // Check if the .ics file exists
-        console.log(`Serving calendar for: ${calendarName}`);
-        if (fs.existsSync(icsFilePath)) {
-            const stats = fs.statSync(icsFilePath);
-            const isOutdated = new Date() - new Date(stats.mtime) > 60 * 60 * 1000;
-
-            if (isOutdated){
-                console.log(`Calendar ${calendarName} is outdated. Refreshing...`);
-                await refreshCalendarData(calendarName);
-
-            }
-
-            res.setHeader('Content-Type', 'text/calendar');
-            res.sendFile(icsFilePath);
-
-        } else {
-            res.status(404).json({ error: 'Calendar not found.' });
-        }
-
-    } catch (error) {
-        console.error('Error retrieving calendar data:', error.message);
-        res.status(500).json({ error: 'Failed to retrieve calendar data.' });
-    }
-});
 
 export default app;