Move API into subdirectory
Update client API