Changed the format and the imports of same classes.