Better estructure (library and sample). Added Check draw.