Thesis restructurized