rearrange samples, fix includes property in detour provider, reference specific couchPotato version