Refactor project files organisation
Add population class
Minor include statements changes