Reworked pretty much everything in order to fit it to the code of our
group

Signed-off-by: Imkerix <Imkerix@live.de>