renamed some classes and added some stubs