Some cleanup.  Moved shaders and added them to cmake build.