moved api classes around, moving some other minor things