Initial pass at Ubuntu update to the new structure