Renamed Basic classes and added tools for primitives combination