Refactoring existing code, moving shaders out of mesh-objects