shaderReorga started
almost working
working again
merged master