rearrange checkout, use master of winrpm