FB user ID changes, and git reorganization