Added structure divided into modules