renamed some classes, preparing for adding wiki support