Merging current state of population branch

 Merging current state of population to provide standard module structure for future branches