Changed dll references to use the public dll