Changed Standard directory to have Class.h and Trait.h instead of a template