moved the single keyword classes into one class