Chanced api to work with Retrofit, much faster now. Also fixed classes a bit for better organization