Replace EDMX and Services tools with one zipped file containing both (due to path too long errors)