Update special comment documentation blocks + minor cosmetics.
Reorganisation in classes depedencies.