restructure and test db