Improved how Firebase database is organized