Some code refactoring, implemented searching of native music