Fixing the server/routing system
Refactored router.js and upated server.js accordingly