Restructing the files. Added validation to change password page