Skybox separation and normal correction

lots o cleanup was done
Skybox separation and normal correction

lots o cleanup was done
FIX THE FUCKING MERGE CONFLICT

git status, change, git add ., git rebase --continue, gogogogogogogogo