moving convenience dependancies out of core project and into main project