Reorganize files
Sender colors optimization