DOC : Finalizing code structure, it should be ok, except few details