project rename & reorganisation