Change the folder structure and add test cases for dbHandler