Correct indexing music
Finalise user adminitration
Cleanup test directory
Remove unused files