Concurrency Locks, Code refactoring

Included concurrency locks on update code for Music collection.  Various
code refactoring for serialising, mapping of data.