Moved around files to separate OS X and X11 implementations.