modified the structure to prepare repo merge

Signed-off-by: Alexander Skjolden <alex@plastboks.net>