Reorganized code and file structure and Updated user and admin login