Re adding of the main classes.