Change comment format
Add some class under Apache class