diff --git a/.rosinstall b/.rosinstall
index 734de65c..ae265453 100755
--- a/.rosinstall
+++ b/.rosinstall
@@ -35,6 +35,11 @@
uri: https://github.com/Arena-Rosnav/arena-simulation-setup.git
version: v2.0.0
+- git:
+ local-name: ../arena-evaluation
+ uri: https://github.com/Arena-Rosnav/arena-evaluation.git
+ version: master
+
### PLANNERS
- git:
diff --git a/evaluation/.gitignore b/evaluation/.gitignore
deleted file mode 100644
index 54df0e08..00000000
--- a/evaluation/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-*/**/*.csv
-*/**/*.zip
-.vscode
-test.ipynb
-*/**/params.yaml
-/**/__pycache__
-/data/**
-!/data/.gitkeep
\ No newline at end of file
diff --git a/evaluation/CMakeLists.txt b/evaluation/CMakeLists.txt
deleted file mode 100644
index 82033727..00000000
--- a/evaluation/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-cmake_minimum_required(VERSION 3.0.2)
-project(arena-evaluation)
-
-find_package(catkin REQUIRED COMPONENTS
- geometry_msgs
- nav_msgs
- roscpp
- rospy
- sensor_msgs
- std_msgs
-)
-catkin_package()
-include_directories(${catkin_INCLUDE_DIRS})
\ No newline at end of file
diff --git a/evaluation/README.md b/evaluation/README.md
deleted file mode 100644
index c899e583..00000000
--- a/evaluation/README.md
+++ /dev/null
@@ -1,118 +0,0 @@
-# Arena Evaluation
-![](http://img.shields.io/badge/stability-stable-orange.svg?style=flat)
-[![Linux](https://svgshare.com/i/Zhy.svg)](https://svgshare.com/i/Zhy.svg)
-[![support level: consortium / vendor](https://img.shields.io/badge/support%20level-consortium%20/%20vendor-brightgreen.svg)](http://rosindustrial.org/news/2016/10/7/better-supporting-a-growing-ros-industrial-software-platform)
-> 🚧 This project is still under development
-
-The Arena Evaluation package provides tools to record, evaluate, and plot navigational metrics to evaluate ROS navigation planners. It is best suited for usage with our [arena-rosnav repository](https://github.com/ignc-research/arena-rosnav) but can also be integrated into any other ROS-based project.
-
-It consists of 3 parts:
-- [Data recording](#01-data-recording)
-- [Data transformation and evaluation](#02-data-transformation-and-evaluation)
-- [Plotting](#03-plotting)
-
-
-
-## General
-
-- To integrate arena evaluation into your project, see the guide [here](docs/integration-requirements.md)
-- To use it along side with the arena repository, install the following requirements:
-
-```bash
-pip install scikit-learn seaborn pandas matplotlib
-```
-## 01 Data Recording
-To record data as csv file while doing evaluation runs set the flag `use_recorder:="true"` in your `roslaunch` command. For example:
-
-```bash
-workon rosnav
-roslaunch arena_bringup start_arena_gazebo.launch world:="aws_house" scenario_file:="aws_house_obs05.json" local_planner:="teb" model:="turtlebot3_burger" use_recorder:="true"
-```
-
-The data will be recorded in `.../catkin_ws/src/forks/arena-evaluation/01_recording`.
-The script stops recording as soon as the agent finishes the scenario and stops moving or after termination criterion is met. Termination criterion as well as recording frequency can be set in `data_recorder_config.yaml`.
-
-```yaml
-max_episodes: 15 # terminates simulation upon reaching xth episode
-max_time: 1200 # terminates simulation after x seconds
-record_frequency: 0.2 # time between actions recorded
-```
-
-> **NOTE**: Leaving the simulation running for a long time after finishing the set number of repetitions does not influence the evaluation results as long as the agent stops running. Also, the last episode of every evaluation run is pruned before evaluating the recorded data.
-
-> **NOTE**: Sometimes csv files will be ignored by git so you have to use git add -f . We recommend using the code below.
-```bash
-roscd arena-evaluation && git add -f .
-git commit -m "evaluation run"
-git pull
-git push
-```
-
-## 02 Data Transformation and Evaluation
-1. After finishing all the evaluation runs, recording the desired csv files and run the `get_metrics.py` script in `/02_evaluation`.
-This script will evaluate the raw data recorded from the evaluation and store it (or them) `.ftr` file with the following naming convention: `data___