Remove folder view
Add db storage