Directory layout and some other changes