changed project structure to implement DB Setup and improved db population file