Major rewrite to use git fetch style checkout without extra dirs