Demographics modularizes and a snippet test is added
directory reorganization