Enhance dir structure, add various classes