refactored choreographe project