More refactoring work, move models to mailme.models