Add headers and solve commons-io dependency