Move UUID to swiss
Use master branch