changed structured. Added more tests
Merge pull request #3 from raytung/devise

changed structured. Added more tests