Reorganized code to simplify fragments

TwitterClient master