Moving things around in order to support Linux