Reorganize, add Live-Monitor