Fixed some directory stuffs