Added Category and CategoryLink classes, which are missing from the last commit.