added a few tests for forgotten password and wrong token at reset and cleaned up file structure