Removed ApiHandler, renamed certain data classes