Folder rename
Better code style
Added UserModel check login