Reorganized src, fixed reauth