Shaders also moved to better obj structure