Move things around to keep things tidy

Moves options parsing into its own file.