Moved api classes to new package