Split it all up slightly more logical

If you were doing something with the past few builds I probably broke something :D

Signed-off-by: Toon Schoenmakers <nighteyes1993@gmail.com>