classes.js refeactoring part #1