Moving all options to a single file
cleanup