Bugfix when data is null means no ebooks found
Increase file hierachy one level to reduce complexity
Update version name
Merge master into develop