wip: re-organise picture config structure