Changed file names to standards
Fixed login/logout bug