Organizing some imports
Bump finagle version