Refactored names and moved RequestBuilder to Api
Finish File rename
Changed tests to use FlatSpec