reorganize files/tweak login