Project restructurized