Fix synchronize bugs and re-organize class folders