fixed reorganizing data
fixed uid login issue
fixed issues with auth