Refactoring the population builder
Making separate views for the input and output deployment models