renamed a few classes, working on updating login speed.