add components and do some class rename