#15
Change some comments and add apache license to new created classes