Trying to fix some directory mess