Now that everything is in the same folder we don't even need a bunch of these options.