putting in better structure from the ubuntu files