Removed other options.
Reorganizing API locations.