Repo reorganisation

Update for chaos repos