Better count of number of production classes
Use AbstractBundle
try to fix all module NPE's (fixes #23)