Moving DB to more structured way