switched to internal github classes wherever possible