cleanup & db entities + tests
media -> music