Added new classes. Removed some classes also.