Changed to use new databse and models

Moved database and models to another library.
Using better models and music library data service.