Organization continuing to shift around constantly.
Removed extra folder...
Put zlib1.dll back. How it disappeared, I don't know.
Merge branch 'master' into graphical