Reorganised files in tache1