REFACTORING: Haus
Signed-off-by: Martika <Martika@MC2>

Change-Id: I4b4cdf146e3c4402ca2896b8b8b62e1ffa504e71