Some fixes to directory layout