some file reorganisation