Extract to base_path instead of final location