Renamed database and genre classes
Renamed database and genre classes

After some unexpected problems with Git some changes were lost. For now
I'm just renaming the classes and tomorrow I'll probably check what was
lost.