skybox moves, removed some couts and moved some includes
fixed merge