Moving over to standalone project