restructuring

Signed-off-by: OEtzi007 <DavidSchmidt314@gmail.com>