Directory structure update (I hope the final :) )