Just a minor reorganisation; move options together into a dedicated file. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>