update folder structure and file names for latest cargo usage