More fixes to move all project requirements under src directory