Move database to common folder, since it will be used also by device service, and implement very minor changes.