New structure is split up in several files