restructure synchronizers
cs
cleanup