New dir structure + java suplink
Deleting old dirs