Move Windows to namespace Window and remove some args