Merging project tree changes and Window cleanup into master
Forgot to move some other shaders into the proper folder