Shader classes added, main cleanup