Also some cleanup & split of tasks between single and multi instance Note: Munin part seems still broken at the time
