Changes

Structure2D strategy with Pixel is a fail! To much references between
Pixel that do not gurantee a compact structure.