A new directory layout better suited to ubuntu