From 42cb7ff441af2244106812e05c92bf83d7cd17fc Mon Sep 17 00:00:00 2001
From: Cedric Beust <cedric@beust.com>
Date: Thu, 10 Mar 2016 03:21:23 +0400
Subject: [PATCH] Update to new structure.

---
 kobalt/src/Build.kt                           |   2 +-
 kobalt/wrapper/kobalt-wrapper.jar             | Bin 7293 -> 7630 bytes
 kobalt/wrapper/kobalt-wrapper.properties      |   2 +-
 .../kotlin/com/beust/kobalt/misc/KFiles.kt    |   3 ++-
 .../java/com/beust/kobalt/wrapper/Main.java   |  23 ++++++++----------
 .../com/beust/kobalt/app/UpdateKobalt.kt      |   2 +-
 src/main/resources/kobalt.properties          |   2 +-
 7 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt
index 1c52b263..ee96794f 100644
--- a/kobalt/src/Build.kt
+++ b/kobalt/src/Build.kt
@@ -136,7 +136,7 @@ val kobaltApp = project(kobaltPluginApi, wrapper) {
         }
         zip {
             val dir = "kobalt-$version"
-            include(from("."), to("$dir/bin"), "kobaltw")
+            include(from("."), to("$dir"), "kobaltw")
             include(from("$buildDirectory/libs"), to("$dir/kobalt/wrapper"),
                     "$projectName-$version.jar")
             include(from("modules/wrapper/$buildDirectory/libs"), to("$dir/kobalt/wrapper"),
diff --git a/kobalt/wrapper/kobalt-wrapper.jar b/kobalt/wrapper/kobalt-wrapper.jar
index e9c0626bf89913a26982a577a2f10f72381c8859..4d7245e937221b95f64edf93a480afb7c943076c 100644
GIT binary patch
delta 7310
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

delta 6970
zcmV-A8^z?#JN-BfP)h>@6aWYa2mm#&P>~IX1U0WvNRgN|e+ghz)zv=dWoF)+$xA{e
zOkh}K5QLDG%?QJyNeB?lf=M6-P@E)>WMG&{XC^GRb!pXFt<|=+6|73FZQSaDnnY>E
zZq(X+-*;PU_iAfhko@0y@6D1hP=6rrzI*Py=bn3(@0|O>^CzEvhKQCcNe}&iD^;%Y
zkiwO2a&fghe`-`->_J;8k0l;n%F9$<?jes*O8H!kYo$F;;}sgO^l*?@$+Fe?yoT4x
zn)BuD0+s8etyk#}LTr#t)_J&**UPpWJiL*cG``To7jd(PZs!&cw{n|I-K6rx8n=6B
z9(Ty2Q{~MbTF6`Ev0mjajW6*~Id^E>t?^cwvQ6dfe;!)Ql^S0v?PVJ8koI!n7t**#
zCiQCEr?DZVohtWxXtl6ZctGQ@w7WFkErSt__sFr)kIG47LL8LGJLD19I3aCP;~_ct
zUJvi%{VE^u@D=<{jo&4Ey<6ieHNHyatA%<^KEH?GD~qm`$8{=Sukrgtz#BAvzlXN+
zjY7Xkf8!6x^qV#Qpm4rL<6DK<hcy1M#vhR>x5?w98h=dXkGuJHJ}C1KseFgVpV0VD
z4@LP#jqlR<ZjBFX{7H@P(fCsu->dPb<t(33d03X*Cw%YM_yLU{RQVwfT`jt}nm?P*
z5A!4PcvR)bJaio&k;mg2KOtv$Qs#^ZgHe^oe>8qd`Y_4U9=e5(ifo_L`12Y+BkYgK
zyk~{@1&zO`@|VQS9V&m>Lx=b)8XuSTs~SHi?bqb-yvAP_DZe3)Z_49a^7yvK-_iKH
z8h=kz_I-_iAd}lv{-K8+61i`;4E-bNuGjd-8vjIQ{4|gF`orRLKlAX<`4>*I{=f@<
zf2r}WgxRk({*5gCtqA-(jejrg3t~~zYyYV6i*C5WpFI2$|5+Y?(fF?#|4rk+d-xyx
zPnG}Wp|A7H@_0q#e@pux55LO))%Z1yU)T5zmEUA4zNoFfuDNr^ruMc?jqROHjU7zh
z=3Sw^p_)i2+F#R=jEAHBtC$KJV$no0e-uq_2}OnsCe>Ql#pJhHbhX!Q0*?u-rr4eC
z9a|dPJDS>BnS5!|y0)&?=C-<ZJ2tmBGr89{H8<{Pt!rt7RO^~LI@_D-H+N!5$BuPP
z?V#<8hXx0Y_@;Oa&t%w0FqK-84kg2pnhYJ%YLQrfv$5BRFmV%8el*s$*NE?ne}|J0
zowqVMWj6>|vMtwPU8}><aB?kEUfH58Opb<FAJ!E$hoeU8(4HP6-WlqNfa2H_3P&ME
zSq?6;(9^iT*BDHOp*odMFij1M4kMAeXkT+^DB3&Fa)$MgyPzW(>fPNE8Z`G)`7MB#
z$|so$<3^}2TNBk~xm96N!?BvCf9T*)60D8T9#b^mp3s3FqXGS-k<Dm&*`nN>fX4_G
zU@%Y+z=zm^eEmkU%QDNla2)1NEyjlH!x00j%<qfsi$-FhzRhtMV?kMtgXXe8kr=>c
zEu0{5uBA9gaYlwMMmzysL(gS7nfkKC&6dg?PIQH%5Hw+09PUwK8){uRe}Tn4LrIfu
zX^L$W=i3RXYBq(E1JKO%06NIrZ$yna^m$RNClpB{G^Um1n!jiZvI1;q>`%r+y~(ZN
zLF<Hza?Z|mY9OP^;{ZZ{9h^O-Vy1az6ZM~4WqN8s)1JWya8FeTm<8MS#s&{`#w;)C
z3MU6({{Fa;fLiLxa(Yslf7mvZ%up}PDYL?=qCnb2Xs=-%*nucrDr#-YEoUCa5w3%x
z$Q)C)${eQ=kH_G8o=8?emFLvtX@X2!-5asP-O~{piuc;mxrJA?EYazY^dh_}S6t}y
zEBdugzoXwX&F+ousp&C>63Lp~rVG^Am{lXJbox8}Lsjy0#i2Oie_|PKb@6!UKr>uT
zS6qsUu&S!c0xVt86gOlOqJ<hbbyXE~qbeR<$yaopenY<nI_OG);?~*CAQuXwDU%PZ
zD@Do_ofmSMt`sX?7+zOO=tW(bs`yl;R9B`c(-BgZ^wopuQ>uzzS7s<Pb!C<^TUE}|
zl{rd4r+?Fb;7!>cf5$XG5$~-LT&#iTnCeW_oWc(pWhi1UYp`wh`Yh+d9OZ1LvomLC
zibRb5P^2#2KeWe)Cez@`G^Zgp6zPjDOa^u$kOQae2S~SQNL;o}g#EnK?pZ3T9|}kM
z40zO>fn;(pSYsKqT1;yj)oQAAWxjF_oVfam@Sv_NV5d$ee`y@~&>pw<nRM!DzzJKt
zy%t=pfs1=|4#<!<TNmxXc*qGuEd*LjT%;>y%$RRevp`k{JB+BYM0GT@M>4gIZMw2Z
zDc9*$`mfFkw9gKP8y4Gu7_b=!13J%R=v_@6lYU7*Qk4o_sZ^?%&Y2ikp`?Y6hADAf
zs;4T|x>BPoe}*hIy0Szz;wsVAt`IakeIgH})!l8TA>k3qQY1KCSw`bJm+~~7r*JXT
zj7+dV+ckj9EaOj08y|{}1~4HYd;?;j<xC2Wq?`-$@B+?bTG}~aSmWVD0JiBtYCRC>
zjm6_bgUQN3N|W$}KsXr)^-JU`wOk0pHUJ)lo&*Qmf4U|o81@DF1CEG8pC@OX7YIcp
zLmvnj`w`ZO%0M&*>FkKMSf@3-Pv-(I)LE5am>&q(<_h!~NuxJu^qso+6b*`CmIhU2
zg|4hrg1WLwS)BqI0qwRdg-r<r(kc_k2SZ078AGGh^dNAJ=w5_%%}^qq=@Jw<Z!Y2}
z&=X1we|X?}8?0<60@()vas~DwZ3GenMh_y2X^re3sDjl4^UM0eaq-B&{KbnV<Kv`|
zG3S>9#nvcmPdRKGjGS_p^OXy9rB115%A9CVXt$A)2>LgAhmuycmfvV4TuX(%Q(Q_s
zSXUa9b;zx{(#V>wtXDQ5Kb`7)(PaF9u55%;e<@93HV@2Z8%I|z6#Si|TqHI?VLNxC
z__9mKfke{SlVy?OiS{sUQIbKX&VhJrpBzG0T9j6urwdk0UmpUiKAD_yTFbAoG|)F>
z$Usv~8{9lGWJnCOiCmkMi*<GhLg?$VTs;NjQ6pJnmg6(h-Hm`jkWl|e;g6=;+a<YZ
zf6cMpkk#)HekGWZ1T0sfXc~+q!q!ly=xDRdcZ+c10Bdw*3zC-7rKq}ciPEhrTNR*I
zQEGkXfk7j%1|pT_;AjpMrv{phXg~aIjT!6PU}D*$Rh(>1I!bIb&8|>%p2f2<JEZ|=
zk*TINX6Y|Wq1Ay7BaX-m#Erp77}GX(e|BzyjrvT5ZkNn?sd5?W8ga!P@c)8|N@Y{9
z%kgrK&U5)}T?t8waCOCFNdc%HrB`sZPv`lJT;kbgqw%E}GnAdGf{Z;NnKCTUH8nLH
zFpHi`1LfuA61#FtG!ka2vP)NXE0NUUP4_{yf-Ib{Gn*v7J-QNAV%X3sC@jAne^lO~
zD#$kp(^^9b1mZwUGKjCHdQ!ah0oCBy|1*jwlpt+AyWl`fXJut{n9&4Yqc1BO3Nr!M
zY;NQ|wVIm{z>QH91o4oyI)izcS_0s;tv*%3O)6I>mPux0LYV+=Z0sm&k|I+Z0Onbj
zK->>dGrEj-422?zNw*T~fUD#Je^ET~jQvtjXoI160u@g3G?y9h%?tIRigzT!S4iSc
z#>~o)scgapF||z&npsoJMPPdFdflv;dn2&~*lV~AHAF&E-Iq+bFPTKSgH0mAFsUWY
z5;QoH|I~%n(5jSuCJ!L$z@*(S4N=~m{zhnH5m*&UV$T2&(5Y<VoXps&e-vJyGGd88
z!6~L?-B+{KBnCDUHw-!HMkN|tm_z2=HyD>hLKOC>dRrG?J3{3HMlxoR#5idQtcuX&
zELya0A#f0_7l4RL1p?2^-l<_A6z_nq8qr?E^vjY{BS|j3V8*m6hm5)IOu6n>r*IZ!
ziTZlYFAVF#aTp;MH%syMe>2_A{#Rvry6sibhlvYI-xm8!(P`?%m5f=}m#SO=eFj5$
zux|^%HPnyAu0A7T$S0;EQ0saUu?Qr#qzX*jz9Sim_J!honaT|?)ZVzMxvrscN8=?;
z9i2_BC_T<@{$I-^<fUd{>ORBggEQ+Qi`!|mD_Bu~ASu>!lr0h{e|6d)(>CPRcKzf%
zGF98@_9#dgxYA|HHAmT2v5bm5Z~2XX!l$V$%onTzLbt@?Mq|W~t6@UE`5F6@c6ag@
zp)^{G*R-0qr2KFq<)qN1+w`WmxwIzx(^_@`xaxG^vEfV~OWwXIE`&~y4?2bh2jwG-
zkp=4$t3nHEk}=EEe+n%pY}(mqL)dA)LT$C&6i_@EizW;!y$M8aG*M=K*ogGmkZ)C6
zQkTI?GX$&pf);UOG4{9Zgb)#%<W3CrBy0dHEo*AZ`8_TlX#s$2ubowvV^&t6q2}nd
zz#P6Iw<|bd*|vH~n=0BSGgHqhTYn}d*>P#byE7Tv+}@P+f9cZ78%>xzzicAqG=7^G
z8<LEkHu)xOnel~^9ApSQD7^@R-f6x~sAd{sk%*PD<huntpe}-Xt}@#VGgDUOstmSf
zvPQa!GM&U7jt&?I+@>~BRko%k)`$??nMj7>W~q{6+Nuc^j!l$rE1__5eJoCM$wfaP
zqI{Y`KcpYwfAaWa^b|S^{hws@`_cbtR{uQof0orhAN`+a_3P08MOMEG{a>O_<dyGm
zXg%^R%pCh2{T}TMxtgP$jx~Rz7xDZPdgoFe-iUnVqr~M$N$DP?yeG*~j)(IxlH2Y}
zcot$BQ2{w<78TJPa?_vbFJLV!mY`M879S-SR;%Eof32Q5M()YWi%6#__*+bWMbCvr
zQTiL6f2V&~toT-JpkeHdqvQdr{Fc16d9@CoqvDx+=$NC{S>bam4Z4(C)$bZ1{Xz40
zMVs)Gr`)>oUbGD}z7$QOUABK<NjchiewVjkgbEMRg1lOFm;&e*nf+3S^rxUd#q7JB
zwW?2je?WNHzk`w^`SCL!Ka0v8P)A;^bC}L{tR1G=5X5o$(lIK2oV=AH)l*cWP}j8%
z_Bjty;Y8B#_yy3()Sv?lW*?&2<$gzH<x}Ki`aG3BMbi{|mZp!Azt-t<K4k7JI@>}%
zJkN$c=E0WpX)2vV(`W(RN@es>T12-~Io&~(e{?5of0%0MAzDnMFviogoQ}b+&tuJZ
zXa#&?B|Iw#?^s3ur8V?Va4jSKBo(OiFXodJWR+g#q9T2U$MHJ(-=Ly5$oUp6Q0Wz(
zWT}7Ce{7?dqZONaDk?{427YEvwssvksUD8fVDfNaEQ&R+LI%s$DrUJbvfp;P=JFAm
ze>Fn0y=RTkoR-St<SiH8ff1TJN@ow##Ybsgw|D+1ozq%1LJJO3Ee9P(X<>KOD3t{r
z<rRJh=J_4RX@=i1LW_pU8+1xnGrNB0v0*AWO6A?&iczXOR`Dq0SWPXo6*6q4?PhCf
zz7~#7v>uw@02^$C7c@a*7tvB`hAvyMf2s|moAB07Vd|s^ZKl0+iK*Eo<a&$BRC-ON
z*T>Ows`Q4{Q|V2WPRP06Izjn(zD|nr1{9R7o|80g2j+Z}Mx>j^uJTroQq7}j6}!x_
z?c|Yfoc0QdL!tVQ(qbrdiFfG;ErU{*d6(lcLg!9iemN=f{nNJSerzaqtCtPof3LOP
z^G0b!3rw)!5CzIBQ(RYqS%q*7T3knIRrwPHORVm$9HliQwDz&ICQC_vquU3MFrdku
z(BN+PMa0yUMtp*nLMzz{kWaDpan81n;}P!O^GE1{$@0fA-<3Z82HPWj=KMO$Z>jt$
zX%%Bs-%|N#S|l&FB1#~nk`QZ%e@bXyMw}8v0+_0-*-YozLgafJ#%P_lafH@CG)ang
zVu71ImKO8&f?9;VnxVlB%@wBHE#*+mMi81>ohdC|2<25-3LK-0Qq*RfnzC5XafDj(
zfD&WWil%LhHg$pG0Hr(6@8|$Im|_XKth_kGIOy`btf}@CvFZr5r>1$$f2}%Fdv;o@
zOs1;eiTyT@(UyZ$<X7$YLsV4mcRod3xE+krB~Y~U5N*q=)qI-s9%{#!-!)3z!?Ypj
zzE+cTVjXK6IQyL=wB38Dytzl{vXt-aDED5Dr{6h7p={p6;}4tcInU|sfrgGyZ&34V
z&(yl}YCS%W&wUTQ<kx(jf2F~EGeG))3nOIMn#ng0q5JjpA<jyv$*+qXJJYHkraS!k
z-hML)=;eNWlm>?BhLqxLP6g0h_#jpIbyGkSe$pJhyW~*9HpS8BFYxPNu)90&2t~kQ
zPuDOl4;DI7D`K*uKm-{~t+iBBI7078i*~ICsiV}d3R1m-I5|mMfB9QVk>WL>LOk#Y
z@So@^MA<dSt?xl*eJ^6}I%I_RAs%j^ZhAlMq8mZE2|42f$PG6kH{6Vx;e)6NZbK6P
zC~*B_;C?&!AH)ua;L>*h6F$LZbSGESUA&C$=JV+=*V8aJ(S6)T_wz1#fUl*8kgq?>
z_tC@rAU(oQ(xdzge;wg((G&bTdXnFwQKg8ELfWU4sr0ncK=&(6$aMcSb9TWvgwRsp
z_;TvsE7lVMcY@sV|BUkApoWv=S7|zfW2-gnJwa>H6xXY)zebB+!}+r@q<{<U9J3OL
zAmM($=_7IYh>d3jCLtjNZ?d)0H0Yd^b%tO8kPHcmy_PjHe}TKt8pM3fyMLIR-lR<H
zn;gn!L>;gfSD<$VT=AV_^sX**=YH&rtn}_fG(}wN5V;-RE3rBQomLWh4mkBSnDu#@
zN#8`#_-zyc-vNYv4`%%VU5Vs=6UxXtkl^n@xp*Ivyr{RHoF`}|p!Ecu1C5QN=5v^;
ze#J~e7Q_`vf2Ns8&J!|T-bAv?R_GKiwiK$&0leiyu?y4sxXMZg+f%2%y1T-Rkx{y)
z6$u(Ae-F|y0{guT2Rkfp*D~DTx}dAljxp47*W0Lr*Y_PnS*E7YZkTqZx4J<hL?(-F
z&A?I98~fF#=>52Y*vqP9-i>}WI|y&O1ch5rOS8Lqe<FwB@$FT|X_Hh8rI7lA!?aH7
z2f?jdhiQdHS|Vo&f_N<G#_Ty+vrB>=%=VbGRU!G^#~y>aZlxz_46*ks)Zu@iTTn^-
zkY2M|mft4HFZN2%e~t5`Z=1griHQ)S(@?dSVO=$9_7$kw*TD>15Vx11{N9b&y%n|d
z-7xx-e+Zf}`WGVnWjM!wu*a*|<ppqjl^3Aq61V7~f|FFOvKPgN$|Y~nYL%zL`v0Y7
zm3?OEr?g=#e?1->@iPw3^Q1iFWox07#?nX~lb<&(NjE(ML)mUq%G2!HVhnL8l|WbC
z+SxA26cxyb9~!2WsM}KJ_^|Cr-j9e~9BCj#e|7-*wlVr>*KFrua`_#{D$MwE4U_xY
zJV4|lk6}X<@iHY1j7tHBglbC#q!q9WBje<Sc59)KwScz<cF=lc`4)Bqj84!N)=d=^
zN#rQp0$@4U{l+9*nVve2^IX`q6sEdRGW*9e;PCMYSshmw4&v6};-Knt9HR4&((O{M
ze;$OR!|wvm(jjrD5xS$+<#QEt_1%;&ZPj5a^gF$u7@<2`hsU3D)H;U8zlZ^P?l6DG
zn?xRTdhfzu&@GGahTow%T$}HAAE$HtZto{Y=$=~Lr{6_W{cfK=#eKP?+)s_ry+IAh
zsj5n{|EC?7SEYz)`9CA7_oNSyrVra`e|s|hK9GF*BXs{H`U5gwOV1bi9t`Rn1nfT4
zjq>}m!9otAmeBo$zWnP%84r)rBmTnUwAo*DoTf=0d~}#L2B-Lo{8P-3T5Z#ogEl1y
z>ak$4ESQ_UU~15d1zvN3X43q{$NajmEs$AAv@?ZmArf?<&DNqJJNpZRpdJgBf5?Kl
z*$buyr((fWo2}6NCCAdq{ILl}AEudUmp&ruaarmyiyXO|Ko^h8-NYwd&FuPpKnk6^
zcsuW)TX+q(aKdii1%$YPZ$_rQg%f<G*?*WH=MnT5^S%7M-F_eRU-Jw6BKpts52a7@
zlqw|%FAXZIrL{xj8Qc|#i^v5~f1eHH3Gh^!$ECCY-o1#YQ#Jc(1<#;*o=HtSi@NzN
z>f-?I;&UhtEZNHo=_*tQ*YhH}nJehST!o6E8WlnfJ;qCr{g=@*yqvy(_BfwMzv30Z
zpp^`Z^8%b{F`qC0`xs}d!->x4ccHzP>ml_T{yy3_d7a|rM#abLl`3vhf0puvN)T-w
z+9qz1Fh#8~YaCZ#tA2RXDjtx#`~aobiE2E~aa_>!T%+k)17M&OkE8CHa^`6&&oJR~
zW*YQ1q|vd2y#J5IX$B5K&BC{{lIY^eJ5GIj>#|YW-0y#CV;uL~(<t<Hn$~P?pHHQe
zXVAny=H{}WE62oaFrCG-f9>S(5@@I?XrKE$)%(Qfw4l2}u;$6`T9<M+U0UgP=SdKa
zl&U`0b)oa{yleb7bKSSyMJr0xsWcj%yXXBYJn3+J%D!wY^FEEoG@#j0@8?qC`T61T
zPdmJQ=F2A>-XLBkm0aA8GN=Q^XD5~NW}3rWXd!n|C0{~IxtrGTe^x}pHtOf?G{~1D
z8bW5`m``~pahG?feAYN!YAF(?;5iOCzL4dLnXQ08Iy=UY9p&b_0eS5iq`C=}Oe*)K
zvGv%5f(viYj?ot?vkJ`2hZytv&3!bL4VuL}X&Lt;>kVXyp~>&!(|6rG^P`tKqatsN
zzL;SncU$7!@*nT9e_&pE!MXMV|BRGuU$VaqKsHAX7BN)ugXEE4@!KpevM=qkXB;8#
zr)c`DgH&*Yz6>5;877bQc06Mt^YRXCR5?jL9>Srl%e#XVp9?x&z<D;~T3a^o{c=jW
zuV$nJ|H;B#L4KCI{6b)xWtYSD7pgw{Yh-Jc_c`mMUX}N2fA&j-eIYdLe&rZFj}rgu
zlIOpHLJ@V$H#4^TmX#_}H7f?cZB+o@$$V8PhdjhrLep1KF<(tH_!=tb_t0Y8xPp8g
zUBK64%lFY`e8YsVa~kkC^;Ngiy!8+*PHp_%F<K`f@jdJKk5h}|aq>FN`rF&z(e3bl
zzvFT0&FIAXF-+ozOV7aHv+(zIVwP{J3RnCeP)i30Czp3MU>X1bp)vpfP)h>@6aWYa
z2mk_^P)L)S95f@a<N^RtO9u!qzbn}n0000L0000`O928D02BZS2nYZ*uTYcm977H@
zuTV%Qmv=Q_8UO&HGLu3bLm&c~P)IMoE7=zS000#L000pH000000000000000I~$Xw
M9U}&j8vp<R01=;@P5=M^

diff --git a/kobalt/wrapper/kobalt-wrapper.properties b/kobalt/wrapper/kobalt-wrapper.properties
index f9410c23..616b4710 100644
--- a/kobalt/wrapper/kobalt-wrapper.properties
+++ b/kobalt/wrapper/kobalt-wrapper.properties
@@ -1 +1 @@
-kobalt.version=0.650
\ No newline at end of file
+kobalt.version=0.661
\ No newline at end of file
diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KFiles.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KFiles.kt
index 7854d370..b3f1262b 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KFiles.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KFiles.kt
@@ -26,7 +26,8 @@ class KFiles {
                 debug("Using kobalt jar $envJar")
                 return listOf(File(envJar).absolutePath)
             } else {
-                val jar = joinDir(distributionsDir, Kobalt.version, "kobalt/wrapper/kobalt-" + Kobalt.version + ".jar")
+                val jar = joinDir(distributionsDir, "kobalt-" + Kobalt.version,
+                        "kobalt/wrapper/kobalt-" + Kobalt.version + ".jar")
                 val jarFile = File(jar)
                 if (jarFile.exists()) {
                     return listOf(jarFile.absolutePath)
diff --git a/modules/wrapper/src/main/java/com/beust/kobalt/wrapper/Main.java b/modules/wrapper/src/main/java/com/beust/kobalt/wrapper/Main.java
index a93a6acb..cb855863 100644
--- a/modules/wrapper/src/main/java/com/beust/kobalt/wrapper/Main.java
+++ b/modules/wrapper/src/main/java/com/beust/kobalt/wrapper/Main.java
@@ -17,7 +17,7 @@ public class Main {
     }
 
     private static final boolean DEV = false;
-    private static final int DEV_VERSION_INT = 650;
+    private static final int DEV_VERSION_INT = 660;
     private static final String DEV_VERSION = "0." + DEV_VERSION_INT;
     private static final String DEV_ZIP = "/Users/beust/kotlin/kobalt/kobaltBuild/libs/kobalt-" + DEV_VERSION + ".zip";
 
@@ -150,12 +150,12 @@ public class Main {
 
         log(2, "Wrapper version: " + wrapperVersion);
 
-        String zipOutputDir = DISTRIBUTIONS_DIR + "/" + wrapperVersion;
         boolean isNew = Float.parseFloat(version) * 1000 >= 650;
-        if (isNew) {
-            zipOutputDir += File.separator + "kobalt-" + version;
-        }
-        Path kobaltJarFile = Paths.get(zipOutputDir,
+
+        String fromZipOutputDir = DISTRIBUTIONS_DIR + File.separator + "kobalt-" + version;
+        String toZipOutputDir = DISTRIBUTIONS_DIR;
+        Path kobaltJarFile = Paths.get(toZipOutputDir,
+                isNew ? "kobalt-" + version : "",
                 getWrapperDir().getPath() + "/" + FILE_NAME + "-" + wrapperVersion + ".jar");
         boolean downloadedZipFile = false;
         if (! Files.exists(localZipFile) || ! Files.exists(kobaltJarFile)) {
@@ -170,7 +170,7 @@ public class Main {
             int retries = 0;
             while (retries < 2) {
                 try {
-                    extractZipFile(localZipFile, zipOutputDir);
+                    extractZipFile(localZipFile, toZipOutputDir);
                     break;
                 } catch (ZipException e) {
                     retries++;
@@ -192,13 +192,10 @@ public class Main {
                 Path to = Paths.get(file);
                 to.toFile().getAbsoluteFile().getParentFile().mkdirs();
 
-                if (Files.exists(to)) {
-                    log(2, to + " already exists, not overwriting it");
-                    continue;
-                } else if (file.endsWith(KOBALTW)) {
+                if (file.endsWith(KOBALTW)) {
                     generateKobaltW(Paths.get(KOBALTW));
                } else {
-                    Path from = Paths.get(zipOutputDir, file);
+                    Path from = Paths.get(fromZipOutputDir, file);
                     try {
                         if (isWindows() && to.toFile().exists()) {
                             log(2, "  Windows detected, not overwriting " + to);
@@ -232,7 +229,7 @@ public class Main {
         }
         log(2, "Generating " + KOBALTW + (envFile.exists() ? " with shebang" : "") + ".");
 
-        content += "java -jar $(dirname $0)/../kobalt/wrapper/kobalt-wrapper.jar $*\n";
+        content += "java -jar $(dirname $0)/kobalt/wrapper/kobalt-wrapper.jar $*\n";
 
         Files.write(filePath, content.getBytes());
 
diff --git a/src/main/kotlin/com/beust/kobalt/app/UpdateKobalt.kt b/src/main/kotlin/com/beust/kobalt/app/UpdateKobalt.kt
index dbcaa86c..cd66c7ff 100644
--- a/src/main/kotlin/com/beust/kobalt/app/UpdateKobalt.kt
+++ b/src/main/kotlin/com/beust/kobalt/app/UpdateKobalt.kt
@@ -41,7 +41,7 @@ class UpdateKobalt @Inject constructor(val github: GithubApi, val wrapperPropert
             val latestVersionString = latestVersionFuture.get()
             val latestVersion = Versions.toLongVersion(latestVersionString)
             val current = Versions.toLongVersion(Kobalt.version)
-            val distFile = File(KFiles.joinDir(KFiles.distributionsDir, latestVersionString))
+            val distFile = File(KFiles.distributionsDir)
             if (latestVersion > current) {
                 if (distFile.exists()) {
                     log(1, "**** Version $latestVersionString is installed, you can switch to it with " +
diff --git a/src/main/resources/kobalt.properties b/src/main/resources/kobalt.properties
index f42b3a9d..593416d8 100644
--- a/src/main/resources/kobalt.properties
+++ b/src/main/resources/kobalt.properties
@@ -1 +1 @@
-kobalt.version=0.650
+kobalt.version=0.661