project structure cleanup, fix for mod mail spam