EF-22 Dependencies moved to root folder