Revert "Created branch for new database structure."

This reverts commit f0e9b0622e3419488200263f65a585edbe5aeff6.