Removed some unneeded classes. Added email storage with tests.