refactor: introduce structure elements
configuration improved (not tested properly yet)