Default to using numeric-subdirs if data_dir comes from $DATA_DIR. Closes #30