changed project structure to implement DB Setup