Fixed data directory and cp_r wonkiness