Remove Login Package and Merge with auth