Database restructured
Merge pull request #175 from nicocarraggi/nicodev

Database restructured