Part of a move to project root