Move OptionSet field
Change files position