Changed names of classes and moved comment column