Rewritten VideoServer + initial cleanup