removing unused code, adding extra data dir under OUT_DIR