Reorganized structure; Generalized OAuth API