diff --git a/js/components/Match.js b/js/components/Match.js
new file mode 100644
index 0000000..eb99e63
--- /dev/null
+++ b/js/components/Match.js
@@ -0,0 +1,228 @@
+import {
+    Button,
+    Card,
+    CardBody,
+    Input,
+    InputGroup,
+    InputGroupAddon,
+    Modal,
+    ModalBody,
+    ModalFooter,
+    ModalHeader,
+    Table
+} from 'reactstrap';
+import React from 'react';
+
+
+export class Match extends React.Component {
+    constructor(props) {
+        super(props);
+        this.state = {
+            modal: false
+        };
+        this.toggleModal = this.toggleModal.bind(this);
+    }
+
+    toggleModal() {
+        const {isSignedIn, isOwner} = this.props;
+
+        if (isSignedIn && isOwner) {
+            this.setState({modal: !this.state.modal});
+        }
+    }
+
+    render() {
+        let cardClass;
+        let smallMessage;
+        let borderClass;
+        // possible states: single_team not_ready not_started in_progress team1_won team2_won undecided
+        switch (this.props.match.state) {
+        case 'in_progress':
+            cardClass = 'table-warning';
+            borderClass = 'border-warning';
+            smallMessage = 'Spiel läuft';
+            break;
+        case 'team1_won':
+            cardClass = 'table-success';
+            borderClass = 'border-success';
+            smallMessage = 'Gewinner: ' + this.props.match.team1;
+            break;
+        case 'team2_won':
+            cardClass = 'table-success';
+            borderClass = 'border-success';
+            smallMessage = 'Gewinner: ' + this.props.match.team2;
+            break;
+        case 'single_team':
+            cardClass = 'table-success';
+            borderClass = 'border-success';
+            smallMessage = 'kein Gegner, Team kommt weiter';
+            break;
+        case 'not_ready':
+            smallMessage = 'Spiel kann noch nicht gestartet werden';
+            break;
+        case 'not_started':
+            smallMessage = 'Spiel kann gestartet werden';
+            break;
+        case 'undecided':
+            cardClass = 'table-success';
+            borderClass = 'border-success';
+            smallMessage = 'Spiel beendet, unentschieden';
+            break;
+        }
+        return (<div className='mb-3'>
+            <Card className='shadow-sm match' onClick={this.toggleModal}>
+                <CardBody className={borderClass + ' border py-2 ' + cardClass}>
+                    <MatchTable match={this.props.match} borderColor={borderClass}/>
+                </CardBody>
+            </Card>
+            <small className='text-muted'>{smallMessage}</small>
+            <MatchModal title='Match' isOpen={this.state.modal} toggle={this.toggleModal} match={this.props.match}/>
+        </div>);
+    }
+}
+
+function MatchModal(props) {
+    let title;
+    let actionButton = '';
+    // possible states: single_team not_ready not_started in_progress team1_won team2_won undecided
+    switch (props.match.state) {
+    case 'in_progress':
+        title = 'Spiel läuft';
+        actionButton = <Button color='primary' onClick={props.toggle}>Spiel beenden</Button>;
+        break;
+    case 'team1_won':
+        title = 'Spiel beendet';
+        break;
+    case 'team2_won':
+        title = 'Spiel beendet';
+        break;
+    case 'single_team':
+        title = 'kein Gegner, Team kommt weiter';
+        break;
+    case 'not_ready':
+        title = 'Spiel kann noch nicht gestartet werden';
+        break;
+    case 'not_started':
+        title = 'Spiel kann gestartet werden';
+        actionButton = <Button color='primary' onClick={props.toggle}>Spiel starten</Button>;
+        break;
+    case 'undecided':
+        title = 'Spiel beendet';
+        break;
+    }
+    return (<Modal isOpen={props.isOpen} toggle={props.toggle}>
+        <ModalHeader toggle={props.toggle}>{title}</ModalHeader>
+        <ModalBody>
+            {props.match.state === 'in_progress' ? <EditableMatchTable match={props.match}/> :
+                <MatchTable match={props.match}/>}
+        </ModalBody>
+        <ModalFooter>
+            {actionButton}
+            <Button color='secondary' onClick={props.toggle}>Abbrechen</Button>
+        </ModalFooter>
+    </Modal>);
+}
+
+function MatchTable(props) {
+    let team1Class;
+    let team2Class;
+    // possible states: single_team not_ready not_started in_progress team1_won team2_won undecided
+    switch (props.match.state) {
+    case 'in_progress':
+        break;
+    case 'team1_won':
+        team1Class = 'font-weight-bold';
+        team2Class = 'lost-team';
+        break;
+    case 'team2_won':
+        team1Class = 'lost-team';
+        team2Class = 'font-weight-bold';
+        break;
+    case 'single_team':
+        team2Class = 'text-muted';
+        break;
+    case 'not_ready':
+        break;
+    case 'not_started':
+        break;
+    case 'undecided':
+        break;
+    }
+    if (props.match.state === 'single_team') {
+        return (<Table className='mb-0'>
+            <tbody>
+                <tr>
+                    <td className={'border-top-0 ' + team1Class}>{props.match.team1}</td>
+                </tr>
+                <tr>
+                    <td className={props.borderColor + ' ' + team2Class}>kein Gegner</td>
+                </tr>
+            </tbody>
+        </Table>);
+    } else {
+        return (<Table className='mb-0'>
+            <tbody>
+                <tr>
+                    <th className='stage border-top-0'>{props.match.scoreTeam1}</th>
+                    <td className={'border-top-0 ' + team1Class}>{props.match.team1}</td>
+                </tr>
+                <tr>
+                    <th className={'stage ' + props.borderColor}>{props.match.scoreTeam2}</th>
+                    <td className={props.borderColor + ' ' + team2Class}>{props.match.team2}</td>
+                </tr>
+            </tbody>
+        </Table>);
+    }
+}
+
+function EditableMatchTable(props) {
+    return (<Table className='mb-0'>
+        <tbody>
+            <tr>
+                <td className='scoreInput border-top-0'>
+                    <ScoreInput score={props.match.scoreTeam1}/>
+                </td>
+                <td className='align-middle border-top-0'>{props.match.team1}</td>
+            </tr>
+            <tr>
+                <td className='scoreInput'>
+                    <ScoreInput score={props.match.scoreTeam2}/>
+                </td>
+                <td className='align-middle'>{props.match.team2}</td>
+            </tr>
+        </tbody>
+    </Table>);
+}
+
+class ScoreInput extends React.Component {
+    constructor(props) {
+        super(props);
+        this.state = {score: this.props.score};
+        this.updateScore = this.updateScore.bind(this);
+        this.increaseScore = this.increaseScore.bind(this);
+        this.decreaseScore = this.decreaseScore.bind(this);
+    }
+
+    updateScore(event) {
+        this.setState({score: event.target.value});
+    }
+
+    increaseScore() {
+        this.setState({score: Number(this.state.score) + 1});
+    }
+
+    decreaseScore() {
+        this.setState({score: Number(this.state.score) - 1});
+    }
+
+    render() {
+        return (<InputGroup>
+            <InputGroupAddon addonType="prepend"><Button onClick={this.decreaseScore} color='danger'
+                outline={true}>-1</Button></InputGroupAddon>
+            <Input className='font-weight-bold' value={this.state.score} onChange={this.updateScore} type='number'
+                step='1' placeholder='0'/>
+            <InputGroupAddon addonType="append"><Button onClick={this.increaseScore}
+                color='success'>+1</Button></InputGroupAddon>
+        </InputGroup>);
+    }
+}
diff --git a/pages/tournament.js b/pages/tournament.js
index 3380d45..8cf898c 100644
--- a/pages/tournament.js
+++ b/pages/tournament.js
@@ -1,24 +1,7 @@
 import Head from 'next/head';
 import React from 'react';
 import {connect} from 'react-redux';
-import {
-    Button,
-    Card,
-    CardBody,
-    Col,
-    Container,
-    Input,
-    InputGroup,
-    InputGroupAddon,
-    ListGroup,
-    ListGroupItem,
-    Modal,
-    ModalBody,
-    ModalFooter,
-    ModalHeader,
-    Row,
-    Table
-} from 'reactstrap';
+import {Col, Container, ListGroup, ListGroupItem, Row} from 'reactstrap';
 
 import {ErrorPageComponent} from '../js/components/ErrorComponents';
 import {Footer} from '../js/components/Footer';
@@ -31,6 +14,7 @@ import 'bootstrap/dist/css/bootstrap.min.css';
 
 import '../static/css/everypage.css';
 import '../static/css/tournament.css';
+import {Match} from '../js/components/Match';
 
 class PrivateTournamentPage extends React.Component {
     render() {
@@ -100,219 +84,6 @@ function Stage(props) {
     </div>);
 }
 
-class Match extends React.Component {
-    constructor(props) {
-        super(props);
-        this.state = {
-            modal: false
-        };
-        this.toggleModal = this.toggleModal.bind(this);
-    }
-
-    toggleModal() {
-        const {isSignedIn, isOwner} = this.props;
-
-        if (isSignedIn && isOwner) {
-            this.setState({modal: !this.state.modal});
-        }
-    }
-
-    render() {
-        let cardClass;
-        let smallMessage;
-        let borderClass;
-        // possible states: single_team not_ready not_started in_progress team1_won team2_won undecided
-        switch (this.props.match.state) {
-        case 'in_progress':
-            cardClass = 'table-warning';
-            borderClass = 'border-warning';
-            smallMessage = 'Spiel läuft';
-            break;
-        case 'team1_won':
-            cardClass = 'table-success';
-            borderClass = 'border-success';
-            smallMessage = 'Gewinner: ' + this.props.match.team1;
-            break;
-        case 'team2_won':
-            cardClass = 'table-success';
-            borderClass = 'border-success';
-            smallMessage = 'Gewinner: ' + this.props.match.team2;
-            break;
-        case 'single_team':
-            cardClass = 'table-success';
-            borderClass = 'border-success';
-            smallMessage = 'kein Gegner, Team kommt weiter';
-            break;
-        case 'not_ready':
-            smallMessage = 'Spiel kann noch nicht gestartet werden';
-            break;
-        case 'not_started':
-            smallMessage = 'Spiel kann gestartet werden';
-            break;
-        case 'undecided':
-            cardClass = 'table-success';
-            borderClass = 'border-success';
-            smallMessage = 'Spiel beendet, unentschieden';
-            break;
-        }
-        return (<div className='mb-3'>
-            <Card className='shadow-sm match' onClick={this.toggleModal}>
-                <CardBody className={borderClass + ' border py-2 ' + cardClass}>
-                    <MatchTable match={this.props.match} borderColor={borderClass}/>
-                </CardBody>
-            </Card>
-            <small className='text-muted'>{smallMessage}</small>
-            <MatchModal title='Match' isOpen={this.state.modal} toggle={this.toggleModal} match={this.props.match}/>
-        </div>);
-    }
-}
-
-function MatchModal(props) {
-    let title;
-    let actionButton = '';
-    // possible states: single_team not_ready not_started in_progress team1_won team2_won undecided
-    switch (props.match.state) {
-    case 'in_progress':
-        title = 'Spiel läuft';
-        actionButton = <Button color='primary' onClick={props.toggle}>Spiel beenden</Button>;
-        break;
-    case 'team1_won':
-        title = 'Spiel beendet';
-        break;
-    case 'team2_won':
-        title = 'Spiel beendet';
-        break;
-    case 'single_team':
-        title = 'kein Gegner, Team kommt weiter';
-        break;
-    case 'not_ready':
-        title = 'Spiel kann noch nicht gestartet werden';
-        break;
-    case 'not_started':
-        title = 'Spiel kann gestartet werden';
-        actionButton = <Button color='primary' onClick={props.toggle}>Spiel starten</Button>;
-        break;
-    case 'undecided':
-        title = 'Spiel beendet';
-        break;
-    }
-    return (<Modal isOpen={props.isOpen} toggle={props.toggle}>
-        <ModalHeader toggle={props.toggle}>{title}</ModalHeader>
-        <ModalBody>
-            {props.match.state === 'in_progress' ? <EditableMatchTable match={props.match}/> :
-                <MatchTable match={props.match}/>}
-        </ModalBody>
-        <ModalFooter>
-            {actionButton}
-            <Button color='secondary' onClick={props.toggle}>Abbrechen</Button>
-        </ModalFooter>
-    </Modal>);
-}
-
-function MatchTable(props) {
-    let team1Class;
-    let team2Class;
-    // possible states: single_team not_ready not_started in_progress team1_won team2_won undecided
-    switch (props.match.state) {
-    case 'in_progress':
-        break;
-    case 'team1_won':
-        team1Class = 'font-weight-bold';
-        team2Class = 'lost-team';
-        break;
-    case 'team2_won':
-        team1Class = 'lost-team';
-        team2Class = 'font-weight-bold';
-        break;
-    case 'single_team':
-        team2Class = 'text-muted';
-        break;
-    case 'not_ready':
-        break;
-    case 'not_started':
-        break;
-    case 'undecided':
-        break;
-    }
-    if (props.match.state === 'single_team') {
-        return (<Table className='mb-0'>
-            <tbody>
-                <tr>
-                    <td className={'border-top-0 ' + team1Class}>{props.match.team1}</td>
-                </tr>
-                <tr>
-                    <td className={props.borderColor + ' ' + team2Class}>kein Gegner</td>
-                </tr>
-            </tbody>
-        </Table>);
-    } else {
-        return (<Table className='mb-0'>
-            <tbody>
-                <tr>
-                    <th className='stage border-top-0'>{props.match.scoreTeam1}</th>
-                    <td className={'border-top-0 ' + team1Class}>{props.match.team1}</td>
-                </tr>
-                <tr>
-                    <th className={'stage ' + props.borderColor}>{props.match.scoreTeam2}</th>
-                    <td className={props.borderColor + ' ' + team2Class}>{props.match.team2}</td>
-                </tr>
-            </tbody>
-        </Table>);
-    }
-}
-
-function EditableMatchTable(props) {
-    return (<Table className='mb-0'>
-        <tbody>
-            <tr>
-                <td className='scoreInput border-top-0'>
-                    <ScoreInput score={props.match.scoreTeam1}/>
-                </td>
-                <td className='align-middle border-top-0'>{props.match.team1}</td>
-            </tr>
-            <tr>
-                <td className='scoreInput'>
-                    <ScoreInput score={props.match.scoreTeam2}/>
-                </td>
-                <td className='align-middle'>{props.match.team2}</td>
-            </tr>
-        </tbody>
-    </Table>);
-}
-
-class ScoreInput extends React.Component {
-    constructor(props) {
-        super(props);
-        this.state = {score: this.props.score};
-        this.updateScore = this.updateScore.bind(this);
-        this.increaseScore = this.increaseScore.bind(this);
-        this.decreaseScore = this.decreaseScore.bind(this);
-    }
-
-    updateScore(event) {
-        this.setState({score: event.target.value});
-    }
-
-    increaseScore() {
-        this.setState({score: Number(this.state.score) + 1});
-    }
-
-    decreaseScore() {
-        this.setState({score: Number(this.state.score) - 1});
-    }
-
-    render() {
-        return (<InputGroup>
-            <InputGroupAddon addonType="prepend"><Button onClick={this.decreaseScore} color='danger'
-                outline={true}>-1</Button></InputGroupAddon>
-            <Input className='font-weight-bold' value={this.state.score} onChange={this.updateScore} type='number'
-                step='1' placeholder='0'/>
-            <InputGroupAddon addonType="append"><Button onClick={this.increaseScore}
-                color='success'>+1</Button></InputGroupAddon>
-        </InputGroup>);
-    }
-}
-
 function convertTournament(apiTournament) {
     let groupStage = null;
     const playoffStages = [];