Changed name of some classes, created a demoer class