Revamped DB schema

Database scheme is being refined to better fit the
application
requirements.