general changes to the structure
v 1.6.5