Options: Renamed to Settings and folder cleanup