organized code

Signed-off-by: Lucas Arnström <lucasarnstrom@gmail.com>