Fixed location of db class
Removed all links to registry class