Improve incremental support
Basic incremental test
Separate service and mail projects