Projectkk2glider/frsky refactoring

Re #1402 

I haven't tested any of this! Please review.