Reorganized code
Wording
Update controller for demographics
Config demographics params
Update works
Demographics works