Move solid choc option to end.  Move dest file to its own dir.