cleaned file names, started layout on choreographers