improve file structure, and correct the patch to remove AnnoncesStatus