New Approach in building up the structure.

Signed-off-by: Hendrik 'Xendo' Meyer <butterkekstorte@users.noreply.github.com>