fixed category and menu generators to handle new directory structure