Add baum/baum bundle to manage nested Categories
Change comments and fix empty lines