Move Options related code into own module