modified the license to Apache and edited file headers