Code reconfiguration

@Langoni, what problem are you trying to solve?