[WIP] Refactor project provider