refinement of managers and reorganisation of files