Moving around abit on code

Signed-off-by: Andre (home) <andre.ok@online.no>