Server / Main + Server refactor