Add Category class and related File/Line plumbing