Project layout fixup