Update to latest rgkit
Organize imports