Refactoring: move shared options to their own module