merge the new changes in and added a login folder