Created new shaders, structured main with methods and two pass
fixed conflicts