Refactor, better package design. Introduce ClassInfo