remove suffix 2 from new classes
add apache license comment to new classes.