Major changes for angular integration

Signed-off-by: Dominic Böttger <Dominic.Boettger@inspirationlabs.com>
lint free

Signed-off-by: Dominic Böttger <Dominic.Boettger@inspirationlabs.com>