Add Croquis classes

Add Croquis classes and refine codes